Cleanup: remove redundant GPU headers

source/blender/gpu/CMakeLists.txt

@@ -21,13 +21,12 @@ set(INC
   ../imbuf
   ../makesdna
   ../makesrna
-  ../windowmanager
 
+  # For theme color access.
   ../editors/include
 
-  # For node muting stuff...
+  # For node muting stuff.
   ../nodes
-  ../nodes/intern
 
   ../../../intern/atomic
   ../../../intern/clog

source/blender/gpu/intern/gpu_batch.cc

@@ -14,7 +14,6 @@
 
 #include "GPU_batch.h"
 #include "GPU_batch_presets.h"
-#include "GPU_matrix.h"
 #include "GPU_platform.h"
 #include "GPU_shader.h"
 

source/blender/gpu/intern/gpu_batch_presets.c

@@ -11,15 +11,8 @@
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
-#include "DNA_userdef_types.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-
 #include "GPU_batch.h"
-#include "GPU_batch_presets.h" /* own include */
+#include "GPU_batch_presets.h" /* Own include. */
-#include "GPU_batch_utils.h"
-#include "GPU_context.h"
 
 /* -------------------------------------------------------------------- */
 /** \name Local Structures
@@ -139,7 +132,7 @@ GPUBatch *GPU_batch_preset_sphere_wire(int lod)
 /** \name Create Sphere (3D)
  * \{ */
 
-GPUBatch *gpu_batch_sphere(int lat_res, int lon_res)
+static GPUBatch *gpu_batch_sphere(int lat_res, int lon_res)
 {
   const float lon_inc = 2 * M_PI / lon_res;
   const float lat_inc = M_PI / lat_res;

source/blender/gpu/intern/gpu_batch_utils.c

@@ -8,7 +8,6 @@
 
 #include "BLI_math.h"
 #include "BLI_polyfill_2d.h"
-#include "BLI_rect.h"
 #include "BLI_sort_utils.h"
 #include "BLI_utildefines.h"
 

source/blender/gpu/intern/gpu_buffers.c

@@ -14,26 +14,18 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_alloca.h"
-#include "BLI_array.h"
 #include "BLI_bitmap.h"
 #include "BLI_ghash.h"
-#include "BLI_hash.h"
-#include "BLI_math.h"
 #include "BLI_math_color.h"
-#include "BLI_math_color_blend.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_userdef_types.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_attribute.h"
 #include "BKE_ccg.h"
 #include "BKE_customdata.h"
-#include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_paint.h"
 #include "BKE_pbvh.h"

source/blender/gpu/intern/gpu_capabilities.cc

@@ -8,7 +8,7 @@
  * with checks for drivers and GPU support.
  */
 
-#include "DNA_userdef_types.h"
+#include "DNA_userdef_types.h" /* For `U.glreslimit`. */
 
 #include "GPU_capabilities.h"
 

source/blender/gpu/intern/gpu_codegen.cc

@@ -12,8 +12,6 @@
 #include "DNA_customdata_types.h"
 #include "DNA_image_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_hash_mm2a.h"
 #include "BLI_link_utils.h"
@@ -23,7 +21,6 @@
 #include "PIL_time.h"
 
 #include "BKE_material.h"
-#include "BKE_world.h"
 
 #include "GPU_capabilities.h"
 #include "GPU_material.h"
@@ -35,7 +32,6 @@
 #include "BLI_vector.hh"
 
 #include "gpu_codegen.h"
-#include "gpu_material_library.h"
 #include "gpu_node_graph.h"
 #include "gpu_shader_create_info.hh"
 #include "gpu_shader_dependency_private.h"

source/blender/gpu/intern/gpu_compute.cc

@@ -7,7 +7,6 @@
 #include "GPU_compute.h"
 
 #include "gpu_backend.hh"
-#include "gpu_storage_buffer_private.hh"
 
 void GPU_compute_dispatch(GPUShader *shader,
                           uint groups_x_len,

source/blender/gpu/intern/gpu_context.cc

@@ -23,8 +23,6 @@
 #include "GPU_context.h"
 #include "GPU_framebuffer.h"
 
-#include "GHOST_C-api.h"
-
 #include "gpu_backend.hh"
 #include "gpu_batch_private.hh"
 #include "gpu_context_private.hh"

source/blender/gpu/intern/gpu_drawlist.cc

@@ -7,9 +7,6 @@
  * Implementation of Multi Draw Indirect.
  */
 
-#include "MEM_guardedalloc.h"
-
-#include "GPU_batch.h"
 #include "GPU_drawlist.h"
 
 #include "gpu_backend.hh"

source/blender/gpu/intern/gpu_framebuffer.cc

@@ -7,7 +7,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_math_base.h"
 #include "BLI_utildefines.h"
 
@@ -18,7 +17,6 @@
 
 #include "gpu_backend.hh"
 #include "gpu_context_private.hh"
-#include "gpu_private.h"
 #include "gpu_texture_private.hh"
 
 #include "gpu_framebuffer_private.hh"

source/blender/gpu/intern/gpu_immediate.cc

@@ -18,7 +18,6 @@
 #include "gpu_context_private.hh"
 #include "gpu_immediate_private.hh"
 #include "gpu_shader_private.hh"
-#include "gpu_vertex_buffer_private.hh"
 #include "gpu_vertex_format_private.h"
 
 using namespace blender::gpu;

source/blender/gpu/intern/gpu_immediate_util.c

@@ -13,7 +13,6 @@
 #include "BLI_utildefines.h"
 
 #include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
 
 #include "UI_resources.h"
 

source/blender/gpu/intern/gpu_init_exit.c

@@ -6,15 +6,10 @@
  */
 
 #include "GPU_init_exit.h" /* interface */
-#include "BKE_global.h"
 #include "BLI_sys_types.h"
 #include "GPU_batch.h"
-#include "GPU_buffers.h"
-#include "GPU_context.h"
-#include "GPU_immediate.h"
 
 #include "intern/gpu_codegen.h"
-#include "intern/gpu_material_library.h"
 #include "intern/gpu_private.h"
 #include "intern/gpu_shader_create_info_private.hh"
 #include "intern/gpu_shader_dependency_private.h"

source/blender/gpu/intern/gpu_material.c

@@ -19,14 +19,11 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
-#include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
-#include "BKE_scene.h"
-#include "BKE_world.h"
 
 #include "NOD_shader.h"
 

source/blender/gpu/intern/gpu_select.c

@@ -12,12 +12,8 @@
 
 #include "GPU_select.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_rect.h"
 
-#include "DNA_userdef_types.h"
-
 #include "BLI_utildefines.h"
 
 #include "gpu_select_private.h"

source/blender/gpu/intern/gpu_select_pick.c

@@ -13,7 +13,6 @@
 
 #include "GPU_debug.h"
 #include "GPU_framebuffer.h"
-#include "GPU_immediate.h"
 #include "GPU_select.h"
 #include "GPU_state.h"
 

source/blender/gpu/intern/gpu_select_sample_query.cc

@@ -19,7 +19,6 @@
 
 #include "BLI_rect.h"
 
-#include "BLI_bitmap.h"
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 

source/blender/gpu/intern/gpu_shader_builtin.c

@@ -5,25 +5,9 @@
  * \ingroup gpu
  */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_math_base.h"
-#include "BLI_math_vector.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_appdir.h"
-#include "BKE_global.h"
-
-#include "DNA_space_types.h"
-
-#include "GPU_matrix.h"
-#include "GPU_platform.h"
 #include "GPU_shader.h"
-#include "GPU_texture.h"
-#include "GPU_uniform_buffer.h"
 
 /* Adjust these constants as needed. */
 #define MAX_DEFINE_LENGTH 256

source/blender/gpu/intern/gpu_shader_create_info.cc

@@ -19,7 +19,6 @@
 #include "gpu_shader_create_info.hh"
 #include "gpu_shader_create_info_private.hh"
 #include "gpu_shader_dependency_private.h"
-#include "gpu_shader_private.hh"
 
 #undef GPU_SHADER_INTERFACE_INFO
 #undef GPU_SHADER_CREATE_INFO

source/blender/gpu/intern/gpu_shader_dependency.cc

@@ -15,7 +15,6 @@
 
 #include "BLI_ghash.h"
 #include "BLI_map.hh"
-#include "BLI_set.hh"
 #include "BLI_string_ref.hh"
 
 #include "gpu_material_library.h"

source/blender/gpu/intern/gpu_shader_log.cc

@@ -15,8 +15,6 @@
 #include "gpu_shader_dependency_private.h"
 #include "gpu_shader_private.hh"
 
-#include "GPU_platform.h"
-
 #include "CLG_log.h"
 
 static CLG_LogRef LOG = {"gpu.shader"};

source/blender/gpu/intern/gpu_state.cc

@@ -14,8 +14,6 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_global.h"
-
 #include "GPU_state.h"
 
 #include "gpu_context_private.hh"

source/blender/gpu/intern/gpu_storage_buffer.cc

@@ -12,7 +12,6 @@
 #include "BLI_math_base.h"
 
 #include "gpu_backend.hh"
-#include "gpu_node_graph.h"
 
 #include "GPU_material.h"
 #include "GPU_vertex_buffer.h" /* For GPUUsageType. */

source/blender/gpu/intern/gpu_texture.cc

@@ -13,7 +13,6 @@
 #include "gpu_backend.hh"
 #include "gpu_context_private.hh"
 #include "gpu_framebuffer_private.hh"
-#include "gpu_vertex_buffer_private.hh"
 
 #include "gpu_texture_private.hh"
 

source/blender/gpu/intern/gpu_vertex_buffer.cc

@@ -12,7 +12,6 @@
 #include "gpu_backend.hh"
 #include "gpu_vertex_format_private.h"
 
-#include "gl_vertex_buffer.hh"    /* TODO: remove. */
 #include "gpu_context_private.hh" /* TODO: remove. */
 
 #include "gpu_vertex_buffer_private.hh"

source/blender/gpu/intern/gpu_viewport.c

@@ -9,16 +9,13 @@
 
 #include <string.h>
 
-#include "BLI_listbase.h"
 #include "BLI_math_vector.h"
-#include "BLI_memblock.h"
 #include "BLI_rect.h"
 
 #include "BKE_colortools.h"
 
 #include "IMB_colormanagement.h"
 
-#include "DNA_userdef_types.h"
 #include "DNA_vec_types.h"
 
 #include "GPU_capabilities.h"

source/blender/gpu/opengl/gl_backend.cc

@@ -10,8 +10,6 @@
 #include "gpu_capabilities_private.hh"
 #include "gpu_platform_private.hh"
 
-#include "glew-mx.h"
-
 #include "gl_debug.hh"
 
 #include "gl_backend.hh"

source/blender/gpu/opengl/gl_batch.cc

@@ -11,12 +11,9 @@
 
 #include "BLI_assert.h"
 
-#include "glew-mx.h"
-
 #include "gpu_batch_private.hh"
 #include "gpu_shader_private.hh"
 
-#include "gl_backend.hh"
 #include "gl_context.hh"
 #include "gl_debug.hh"
 #include "gl_index_buffer.hh"

source/blender/gpu/opengl/gl_compute.cc

@@ -8,8 +8,6 @@
 
 #include "gl_debug.hh"
 
-#include "glew-mx.h"
-
 namespace blender::gpu {
 
 void GLCompute::dispatch(int group_x_len, int group_y_len, int group_z_len)

source/blender/gpu/opengl/gl_context.cc

@@ -6,7 +6,6 @@
  */
 
 #include "BLI_assert.h"
-#include "BLI_system.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_global.h"

source/blender/gpu/opengl/gl_debug_layer.cc

@@ -10,8 +10,6 @@
 
 #include "BLI_utildefines.h"
 
-#include "glew-mx.h"
-
 #include "gl_debug.hh"
 
 using GPUvoidptr = void *;

source/blender/gpu/opengl/gl_drawlist.cc

@@ -11,9 +11,6 @@
 #include "BLI_assert.h"
 
 #include "GPU_batch.h"
-#include "GPU_capabilities.h"
-
-#include "glew-mx.h"
 
 #include "gpu_context_private.hh"
 #include "gpu_drawlist_private.hh"

source/blender/gpu/opengl/gl_framebuffer.cc

@@ -7,8 +7,6 @@
 
 #include "BKE_global.h"
 
-#include "GPU_capabilities.h"
-
 #include "gl_backend.hh"
 #include "gl_debug.hh"
 #include "gl_state.hh"

source/blender/gpu/opengl/gl_immediate.cc

@@ -7,8 +7,6 @@
  * Mimics old style opengl immediate mode drawing.
  */
 
-#include "BKE_global.h"
-
 #include "gpu_context_private.hh"
 #include "gpu_shader_private.hh"
 #include "gpu_vertex_format_private.h"

source/blender/gpu/opengl/gl_index_buffer.cc

@@ -6,7 +6,6 @@
  */
 
 #include "gl_context.hh"
-#include "gl_debug.hh"
 
 #include "gl_index_buffer.hh"
 

source/blender/gpu/opengl/gl_shader.cc

@@ -13,7 +13,6 @@
 #include "GPU_capabilities.h"
 #include "GPU_platform.h"
 
-#include "gl_backend.hh"
 #include "gl_debug.hh"
 #include "gl_vertex_buffer.hh"
 

source/blender/gpu/opengl/gl_shader_interface.cc

@@ -9,7 +9,6 @@
 
 #include "BLI_bitmap.h"
 
-#include "gl_backend.hh"
 #include "gl_batch.hh"
 #include "gl_context.hh"
 

source/blender/gpu/opengl/gl_state.cc

@@ -12,10 +12,7 @@
 
 #include "GPU_capabilities.h"
 
-#include "glew-mx.h"
-
 #include "gl_context.hh"
-#include "gl_debug.hh"
 #include "gl_framebuffer.hh"
 #include "gl_texture.hh"
 

source/blender/gpu/opengl/gl_storage_buffer.cc

@@ -5,8 +5,6 @@
  * \ingroup gpu
  */
 
-#include "BKE_global.h"
-
 #include "BLI_string.h"
 
 #include "gpu_backend.hh"

source/blender/gpu/opengl/gl_texture.cc

@@ -5,8 +5,6 @@
  * \ingroup gpu
  */
 
-#include "BKE_global.h"
-
 #include "DNA_userdef_types.h"
 
 #include "GPU_capabilities.h"

source/blender/gpu/opengl/gl_uniform_buffer.cc

@@ -5,14 +5,10 @@
  * \ingroup gpu
  */
 
-#include "BKE_global.h"
-
 #include "BLI_string.h"
 
-#include "gpu_backend.hh"
 #include "gpu_context_private.hh"
 
-#include "gl_backend.hh"
 #include "gl_debug.hh"
 #include "gl_uniform_buffer.hh"
 

source/blender/gpu/opengl/gl_vertex_array.cc

@@ -7,7 +7,6 @@
 
 #include "gpu_shader_interface.hh"
 #include "gpu_vertex_buffer_private.hh"
-#include "gpu_vertex_format_private.h"
 
 #include "gl_batch.hh"
 #include "gl_context.hh"

source/blender/python/gpu/gpu_py_api.c

@@ -14,8 +14,6 @@
 
 #include "BLI_utildefines.h"
 
-#include "../generic/python_utildefines.h"
-
 #include "gpu_py_capabilities.h"
 #include "gpu_py_matrix.h"
 #include "gpu_py_platform.h"
@@ -23,7 +21,7 @@
 #include "gpu_py_state.h"
 #include "gpu_py_types.h"
 
-#include "gpu_py_api.h" /* own include */
+#include "gpu_py_api.h" /* Own include. */
 
 /* -------------------------------------------------------------------- */
 /** \name GPU Module

source/blender/python/gpu/gpu_py_batch.c

@@ -13,14 +13,10 @@
 
 #include <Python.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_utildefines.h"
 
 #include "GPU_batch.h"
 
-#include "../mathutils/mathutils.h"
-
 #include "../generic/py_capi_utils.h"
 
 #include "gpu_py.h"

source/blender/python/gpu/gpu_py_element.c

@@ -16,7 +16,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
 
 #include "gpu_py.h"
 #include "gpu_py_element.h" /* own include */

source/blender/python/gpu/gpu_py_offscreen.c

@@ -13,8 +13,6 @@
 
 #include <Python.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
@@ -31,7 +29,6 @@
 #include "GPU_texture.h"
 #include "GPU_viewport.h"
 
-#include "ED_view3d.h"
 #include "ED_view3d_offscreen.h"
 
 #include "../mathutils/mathutils.h"

source/blender/python/gpu/gpu_py_platform.c

@@ -13,7 +13,7 @@
 
 #include "GPU_platform.h"
 
-#include "gpu_py_platform.h" /* own include */
+#include "gpu_py_platform.h" /* Own include. */
 
 /* -------------------------------------------------------------------- */
 /** \name Functions

source/blender/python/gpu/gpu_py_select.c

@@ -20,7 +20,7 @@
 
 #include "GPU_select.h"
 
-#include "gpu_py_select.h" /* own include */
+#include "gpu_py_select.h" /* Own include. */
 
 /* -------------------------------------------------------------------- */
 /** \name Methods

source/blender/python/gpu/gpu_py_shader.c

@@ -16,7 +16,6 @@
 #include "GPU_uniform_buffer.h"
 
 #include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
 #include "../mathutils/mathutils.h"
 
 #include "gpu_py.h"

source/blender/python/gpu/gpu_py_shader_create_info.cc

@@ -15,7 +15,6 @@
 #include "intern/gpu_shader_create_info.hh"
 
 #include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
 
 #include "gpu_py_shader.h" /* own include */
 

source/blender/python/gpu/gpu_py_types.c

@@ -10,7 +10,6 @@
 #include <Python.h>
 
 #include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
 
 #include "gpu_py_types.h" /* own include */
 

source/blender/python/gpu/gpu_py_uniformbuffer.c

@@ -14,13 +14,11 @@
 #include "BLI_string.h"
 
 #include "GPU_context.h"
-#include "GPU_texture.h"
 #include "GPU_uniform_buffer.h"
 
 #include "../generic/py_capi_utils.h"
 
 #include "gpu_py.h"
-#include "gpu_py_buffer.h"
 
 #include "gpu_py_uniformbuffer.h" /* own include */
 

source/blender/python/gpu/gpu_py_vertex_format.c

@@ -9,10 +9,6 @@
 
 #include <Python.h>
 
-#include "BLI_math.h"
-
-#include "MEM_guardedalloc.h"
-
 #include "../generic/py_capi_utils.h"
 #include "../generic/python_utildefines.h"