Merge branch 'master' into temp-ghash-setopstemp-ghash-setops

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h
index 3d72fe17c79..5dc52b2e4fb 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -32,6 +32,23 @@
 #ifndef __WM_DRAW_H__
 #define __WM_DRAW_H__
 
+#include "GPU_glew.h"
+
+
+#define MAX_N_TEX 3
+
+typedef struct wmDrawTriple {
+	GLuint bind[MAX_N_TEX * MAX_N_TEX];
+	int x[MAX_N_TEX], y[MAX_N_TEX];
+	int nx, ny;
+	GLenum target;
+} wmDrawTriple;
+
+typedef struct wmDrawData {
+	struct wmDrawData *next, *prev;
+	wmDrawTriple *triple;
+} wmDrawData;
+
 struct bContext;
 struct wmWindow;
 struct ARegion;
@@ -43,5 +60,9 @@ void		wm_draw_region_clear	(struct wmWindow *win, struct ARegion *ar);
 
 void		wm_tag_redraw_overlay	(struct wmWindow *win, struct ARegion *ar);
 
+void		wm_triple_draw_textures	(struct wmWindow *win, struct wmDrawTriple *triple, float alpha);
+
+void		wm_draw_data_free		(struct wmWindow *win);
+
 #endif /* __WM_DRAW_H__ */