[Bf-blender-cvs] [0ec65646681] master: Cleanup: unused headers (GPU)
Campbell Barton
noreply at git.blender.org
Fri Sep 13 16:24:00 CEST 2019
Commit: 0ec65646681795662577b7e64a2a6397ccbd2cd5
Author: Campbell Barton
Date: Sat Sep 14 00:20:15 2019 +1000
Branches: master
https://developer.blender.org/rB0ec65646681795662577b7e64a2a6397ccbd2cd5
Cleanup: unused headers (GPU)
===================================================================
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/draw/intern/draw_cache_extract_mesh.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/gizmo_library/gizmo_draw_utils.c
M source/blender/editors/gizmo_library/gizmo_library_presets.c
M source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_icons_event.c
M source/blender/editors/mask/mask_draw.c
M source/blender/editors/mesh/editface.c
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/editors/space_clip/clip_dopesheet_draw.c
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/gpu/intern/gpu_immediate_util.c
M source/blender/gpu/intern/gpu_init_exit.c
M source/blender/gpu/intern/gpu_select.c
M source/blender/gpu/intern/gpu_select_pick.c
M source/blender/gpu/intern/gpu_select_sample_query.c
M source/blender/gpu/intern/gpu_shader.c
M source/blender/gpu/intern/gpu_viewport.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo.c
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/intern/wm_window.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 6748a5324ac..1369240f0e2 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -50,7 +50,6 @@
#include "UI_interface.h"
-#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "GPU_batch.h"
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 980d067c90f..0eca4489309 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -36,7 +36,6 @@
#include "BKE_paint.h"
#include "GPU_buffers.h"
-#include "GPU_immediate.h"
#include "bmesh.h"
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c
index 48c28496584..d7971a9e7db 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.c
@@ -60,7 +60,6 @@
#include "GPU_batch.h"
#include "GPU_extensions.h"
-#include "GPU_material.h"
#include "DRW_render.h"
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index f0afbe2afe5..56b2b20cc05 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -55,7 +55,6 @@
#include "bmesh.h"
#include "GPU_batch.h"
-#include "GPU_extensions.h"
#include "GPU_material.h"
#include "DRW_render.h"
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 4538b16e2ce..fae0b28bd76 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -67,7 +67,6 @@
#include "GPU_uniformbuffer.h"
#include "GPU_viewport.h"
#include "GPU_matrix.h"
-#include "GPU_select.h"
#include "IMB_colormanagement.h"
@@ -100,10 +99,6 @@
#include "DRW_select_buffer.h"
-#ifdef USE_GPU_SELECT
-# include "GPU_select.h"
-#endif
-
/** Render State: No persistent data between draw calls. */
DRWManager DST = {NULL};
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 9732f36e293..1dcaf39fc19 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -28,7 +28,6 @@
#include "BKE_global.h"
-#include "GPU_draw.h"
#include "GPU_extensions.h"
#include "intern/gpu_shader_private.h"
#include "intern/gpu_primitive_private.h"
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index b76c17b981b..83a271a3ccd 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -23,8 +23,6 @@
#include "DRW_engine.h"
#include "DRW_render.h"
-#include "GPU_extensions.h"
-
#include "DNA_mesh_types.h"
#include "DNA_view3d_types.h"
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index ca7e0eae136..c174ce83bea 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -45,7 +45,6 @@
#include "BKE_fcurve.h"
-#include "GPU_draw.h"
#include "GPU_immediate.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/gizmo_library/gizmo_draw_utils.c b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
index 7aef097d036..cffafc56693 100644
--- a/source/blender/editors/gizmo_library/gizmo_draw_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
@@ -31,7 +31,6 @@
#include "GPU_batch.h"
#include "GPU_glew.h"
#include "GPU_immediate.h"
-#include "GPU_state.h"
#include "MEM_guardedalloc.h"
diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c
index ae43894b7b6..59c5b758e1b 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_presets.c
+++ b/source/blender/editors/gizmo_library/gizmo_library_presets.c
@@ -31,9 +31,6 @@
#include "BKE_context.h"
-#include "GPU_draw.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
#include "GPU_matrix.h"
#include "GPU_select.h"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
index c175bfb90ab..24571f67fdb 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
@@ -31,7 +31,6 @@
#include "BKE_context.h"
-#include "GPU_draw.h"
#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
index fa9c0f1fbb2..6a28c626a81 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
@@ -38,7 +38,6 @@
#include "BKE_context.h"
-#include "GPU_draw.h"
#include "GPU_immediate.h"
#include "GPU_immediate_util.h"
#include "GPU_matrix.h"
diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c
index 697d06aa098..683ee7fb973 100644
--- a/source/blender/editors/gpencil/annotate_draw.c
+++ b/source/blender/editors/gpencil/annotate_draw.c
@@ -55,7 +55,6 @@
#include "BIF_glutil.h"
#include "GPU_immediate.h"
-#include "GPU_draw.h"
#include "GPU_state.h"
#include "ED_gpencil.h"
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 7c76f3aeab6..4015fa12438 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -62,7 +62,6 @@
#include "BIF_glutil.h"
#include "GPU_immediate.h"
-#include "GPU_draw.h"
#include "GPU_state.h"
#include "ED_gpencil.h"
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index d1c4f271321..89cb85b0e17 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -71,10 +71,6 @@
#include "ED_screen.h"
#include "ED_view3d.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_state.h"
-
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 372973e1040..ea93f861c6e 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -62,7 +62,6 @@
#include "IMB_imbuf_types.h"
#include "GPU_immediate.h"
-#include "GPU_draw.h"
#include "GPU_matrix.h"
#include "GPU_framebuffer.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index bbf55dc2213..104b41491c2 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -27,7 +27,6 @@
#include "MEM_guardedalloc.h"
-#include "GPU_draw.h"
#include "GPU_matrix.h"
#include "GPU_batch.h"
#include "GPU_immediate.h"
diff --git a/source/blender/editors/interface/interface_icons_event.c b/source/blender/editors/interface/interface_icons_event.c
index 0992ee95fd7..e1ce77b8b61 100644
--- a/source/blender/editors/interface/interface_icons_event.c
+++ b/source/blender/editors/interface/interface_icons_event.c
@@ -29,8 +29,6 @@
#include "MEM_guardedalloc.h"
-#include "GPU_draw.h"
-#include "GPU_matrix.h"
#include "GPU_batch.h"
#include "GPU_immediate.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 594fae51fde..7247697dcb7 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -43,7 +43,6 @@
#include "BIF_glutil.h"
#include "GPU_immediate.h"
-#include "GPU_draw.h"
#include "GPU_shader.h"
#include "GPU_matrix.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 9a70b0a8d36..b7f506a8a41 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -46,8 +46,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "GPU_draw.h"
-
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 2ddd654f824..3be94cf99c1 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -39,10 +39,6 @@
#include "BKE_unit.h"
#include "BKE_layer.h"
-#include "GPU_immediate.h"
-#include "GPU_matrix.h"
-#include "GPU_state.h"
-
#include "UI_interface.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 55a71ee8989..053ca3d8f9f 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -80,8 +80,6 @@
#include "IMB_colormanagement.h"
#include "IMB_imbuf_types.h"
-#include "GPU_shader.h"
-
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index b0c9e3b9378..2ad512851b1 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -55,7 +55,6 @@
#include "GPU_immediate.h"
#include "GPU_immediate_util.h"
#include "GPU_matrix.h"
-#include "GPU_draw.h"
#include "GPU_state.h"
#include "GPU_framebuffer.h"
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index af1e0eeed79..69bcb4d8a48 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -41,7 +41,6 @@
#include "GPU_immediate.h"
#include "GPU_matrix.h"
-#include "GPU_state.h"
#include "UI_interface.h"
diff --git a/source/blend
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list