diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:29:51 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:30:39 +0300 |
commit | 3176bb83469df9dcba1f8243763bf182daeea6bb (patch) | |
tree | 88d9867374a51774832cf224788b6bc624f2d7a2 /source | |
parent | 2a8dd3c5ff5bd58411ee6a00d8a9087ce98941e0 (diff) |
clean up GL / GPU #includes
Diffstat (limited to 'source')
8 files changed, 3 insertions, 21 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 64f7b1adc33..71d16328374 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 f8e16758dcc..ec6eddf85a2 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 8113240d839..4101a36d489 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 d13d2be068b..0a16bf02873 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 809a5cac6e8..daba01cb3a6 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 6591005b5f3..bf76cabb59f 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 d312f4c007c..6b3f530133f 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 458ac4a121a..c401a11f74d 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" |