[Bf-blender-cvs] [3176bb8346] blender2.8: clean up GL / GPU #includes

[Mike Erwin]

Commit: 3176bb83469df9dcba1f8243763bf182daeea6bb
Author: Mike Erwin
Date:   Tue Feb 28 15:29:51 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB3176bb83469df9dcba1f8243763bf182daeea6bb

clean up GL / GPU #includes

===================================================================

M	source/blender/editors/interface/interface_draw.c
M	source/blender/editors/space_clip/clip_draw.c
M	source/blender/editors/space_file/file_draw.c
M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/windowmanager/intern/wm_draw.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_stereo.c
M	source/blender/windowmanager/intern/wm_subwindow.c

===================================================================

diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 64f7b1adc3..71d1632837 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -50,13 +50,10 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_colormanagement.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
 #include "BLF_api.h"
 
-#include "GPU_draw.h"
-#include "GPU_basic_shader.h"
 #include "GPU_batch.h"
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index f8e16758dc..ec6eddf85a 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -58,7 +58,6 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
 
@@ -68,7 +67,6 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-
 #include "BLF_api.h"
 
 #include "clip_intern.h"    // own include
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 8113240d83..4101a36d48 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -42,7 +42,6 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
 #include "BKE_context.h"
@@ -71,8 +70,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-//#include "GPU_draw.h"
-//#include "GPU_basic_shader.h"
 #include "GPU_immediate.h"
 
 #include "filelist.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index d13d2be068..0a16bf0287 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -55,10 +55,8 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
-#include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "GPU_basic_shader.h"
 #include "GPU_immediate.h"
 
 #include "ED_anim_api.h"
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 809a5cac6e..daba01cb3a 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -57,8 +57,6 @@
 
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
-#include "GPU_glew.h"
-#include "GPU_basic_shader.h"
 #include "GPU_immediate.h"
 
 #include "RE_engine.h"
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 6591005b5f..bf76cabb59 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -86,9 +86,11 @@
 
 #include "BKE_idcode.h"
 
-#include "BIF_glutil.h" /* for paint cursor */
 #include "BLF_api.h"
 
+#include "BIF_glutil.h" /* for paint cursor */
+#include "GPU_immediate.h"
+
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
@@ -97,9 +99,6 @@
 #include "ED_util.h"
 #include "ED_view3d.h"
 
-#include "GPU_basic_shader.h"
-#include "GPU_immediate.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index d312f4c007..6b3f530133 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -52,8 +52,6 @@
 
 #include "ED_screen.h"
 
-#include "GPU_glew.h"
-#include "GPU_basic_shader.h"
 #include "GPU_immediate.h"
 
 #include "WM_api.h"
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 458ac4a121..c401a11f74 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -47,9 +47,6 @@
 
 #include "BIF_gl.h"
 
-#include "GPU_extensions.h"
-#include "GPU_basic_shader.h"
-
 #include "WM_api.h"
 #include "wm_subwindow.h"