[Bf-blender-cvs] [75f0aaab3d3] master: Cleanup: remove redundant GPU headers
Campbell Barton
noreply at git.blender.org
Wed Jun 22 07:03:40 CEST 2022
Commit: 75f0aaab3d37f9eac61d5cea2b42b16adabff304
Author: Campbell Barton
Date: Wed Jun 22 14:59:42 2022 +1000
Branches: master
https://developer.blender.org/rB75f0aaab3d37f9eac61d5cea2b42b16adabff304
Cleanup: remove redundant GPU headers
===================================================================
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/intern/gpu_batch.cc
M source/blender/gpu/intern/gpu_batch_presets.c
M source/blender/gpu/intern/gpu_batch_utils.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_capabilities.cc
M source/blender/gpu/intern/gpu_codegen.cc
M source/blender/gpu/intern/gpu_compute.cc
M source/blender/gpu/intern/gpu_context.cc
M source/blender/gpu/intern/gpu_drawlist.cc
M source/blender/gpu/intern/gpu_framebuffer.cc
M source/blender/gpu/intern/gpu_immediate.cc
M source/blender/gpu/intern/gpu_immediate_util.c
M source/blender/gpu/intern/gpu_init_exit.c
M source/blender/gpu/intern/gpu_material.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.cc
M source/blender/gpu/intern/gpu_shader_builtin.c
M source/blender/gpu/intern/gpu_shader_create_info.cc
M source/blender/gpu/intern/gpu_shader_dependency.cc
M source/blender/gpu/intern/gpu_shader_log.cc
M source/blender/gpu/intern/gpu_state.cc
M source/blender/gpu/intern/gpu_storage_buffer.cc
M source/blender/gpu/intern/gpu_texture.cc
M source/blender/gpu/intern/gpu_vertex_buffer.cc
M source/blender/gpu/intern/gpu_viewport.c
M source/blender/gpu/opengl/gl_backend.cc
M source/blender/gpu/opengl/gl_batch.cc
M source/blender/gpu/opengl/gl_compute.cc
M source/blender/gpu/opengl/gl_context.cc
M source/blender/gpu/opengl/gl_debug_layer.cc
M source/blender/gpu/opengl/gl_drawlist.cc
M source/blender/gpu/opengl/gl_framebuffer.cc
M source/blender/gpu/opengl/gl_immediate.cc
M source/blender/gpu/opengl/gl_index_buffer.cc
M source/blender/gpu/opengl/gl_shader.cc
M source/blender/gpu/opengl/gl_shader_interface.cc
M source/blender/gpu/opengl/gl_state.cc
M source/blender/gpu/opengl/gl_storage_buffer.cc
M source/blender/gpu/opengl/gl_texture.cc
M source/blender/gpu/opengl/gl_uniform_buffer.cc
M source/blender/gpu/opengl/gl_vertex_array.cc
M source/blender/python/gpu/gpu_py_api.c
M source/blender/python/gpu/gpu_py_batch.c
M source/blender/python/gpu/gpu_py_element.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/python/gpu/gpu_py_platform.c
M source/blender/python/gpu/gpu_py_select.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/python/gpu/gpu_py_shader_create_info.cc
M source/blender/python/gpu/gpu_py_types.c
M source/blender/python/gpu/gpu_py_uniformbuffer.c
M source/blender/python/gpu/gpu_py_vertex_format.c
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index faf68cf2197..cadc2c4445b 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/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
diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc
index 32b117dac12..1b34b6e6c69 100644
--- a/source/blender/gpu/intern/gpu_batch.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_batch_presets.c b/source/blender/gpu/intern/gpu_batch_presets.c
index ab5e23a846c..4dff35c3633 100644
--- a/source/blender/gpu/intern/gpu_batch_presets.c
+++ b/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_utils.h"
-#include "GPU_context.h"
+#include "GPU_batch_presets.h" /* Own include. */
/* -------------------------------------------------------------------- */
/** \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;
diff --git a/source/blender/gpu/intern/gpu_batch_utils.c b/source/blender/gpu/intern/gpu_batch_utils.c
index 43a47aab945..10a05fe90b9 100644
--- a/source/blender/gpu/intern/gpu_batch_utils.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index f7be2434fbf..a1fe3d79223 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc
index eb69a1d2635..18748627b83 100644
--- a/source/blender/gpu/intern/gpu_capabilities.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc
index a5ba0949a83..fa7ce3a364b 100644
--- a/source/blender/gpu/intern/gpu_codegen.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_compute.cc b/source/blender/gpu/intern/gpu_compute.cc
index b45cf8211cb..277f6d22280 100644
--- a/source/blender/gpu/intern/gpu_compute.cc
+++ b/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,
diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc
index b7dad589395..9fb5826506a 100644
--- a/source/blender/gpu/intern/gpu_context.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_drawlist.cc b/source/blender/gpu/intern/gpu_drawlist.cc
index b5b8d2f90bc..e1699bd0036 100644
--- a/source/blender/gpu/intern/gpu_drawlist.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc
index fb3c9549f18..08d761106e5 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc
index 69467e5b28a..8f04b1c2dfe 100644
--- a/source/blender/gpu/intern/gpu_immediate.cc
+++ b/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;
diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c
index daefd57a5b3..a275fd8fc6c 100644
--- a/source/blender/gpu/intern/gpu_immediate_util.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_init_exit.c b/source/blender/gpu/intern/gpu_init_exit.c
index e97c9e9c829..062614fb5cb 100644
--- a/source/blender/gpu/intern/gpu_init_exit.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 5d6651c3e3a..4d3ea3e0c99 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index ac33c5d5ca8..7afba20c2d9 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c
index 840201c8c97..b5b2d7fa1a5 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.cc b/source/blender/gpu/intern/gpu_select_sample_query.cc
index 26c9ed79d6c..7393dfd0d81 100644
--- a/source/blender/gpu/intern/gpu_select_sample_query.cc
+++ b/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"
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index b92fae4a89b..c3a1236e814 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/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_unif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list