From 13bb08286e98c025d8bded932be65afb2ca8718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 30 Jan 2026 12:34:25 +0100 Subject: [PATCH] GLES3: Remove unnecessary includes --- drivers/gles3/effects/feed_effects.h | 1 - drivers/gles3/rasterizer_canvas_gles3.cpp | 3 +-- drivers/gles3/rasterizer_canvas_gles3.h | 5 ----- drivers/gles3/rasterizer_gles3.cpp | 2 -- drivers/gles3/rasterizer_scene_gles3.cpp | 2 +- drivers/gles3/rasterizer_scene_gles3.h | 9 +-------- drivers/gles3/shader_gles3.cpp | 1 + drivers/gles3/shader_gles3.h | 8 +++----- drivers/gles3/storage/config.cpp | 2 ++ drivers/gles3/storage/config.h | 8 ++++++-- drivers/gles3/storage/light_storage.cpp | 2 +- drivers/gles3/storage/light_storage.h | 3 ++- drivers/gles3/storage/material_storage.cpp | 1 - drivers/gles3/storage/texture_storage.h | 3 +-- 14 files changed, 19 insertions(+), 31 deletions(-) diff --git a/drivers/gles3/effects/feed_effects.h b/drivers/gles3/effects/feed_effects.h index 255fd80ce6..78a705754f 100644 --- a/drivers/gles3/effects/feed_effects.h +++ b/drivers/gles3/effects/feed_effects.h @@ -32,7 +32,6 @@ #ifdef GLES3_ENABLED -#include "drivers/gles3/shader_gles3.h" #include "drivers/gles3/shaders/feed.glsl.gen.h" namespace GLES3 { diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index cdb69da324..29e2fae7bb 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -36,13 +36,12 @@ #include "core/math/geometry_2d.h" #include "core/math/transform_interpolator.h" #include "drivers/gles3/rasterizer_gles3.h" -#include "drivers/gles3/rasterizer_scene_gles3.h" #include "drivers/gles3/storage/config.h" -#include "drivers/gles3/storage/material_storage.h" #include "drivers/gles3/storage/mesh_storage.h" #include "drivers/gles3/storage/particles_storage.h" #include "drivers/gles3/storage/texture_storage.h" #include "servers/rendering/rendering_server_default.h" +#include "servers/rendering/rendering_server_globals.h" void RasterizerCanvasGLES3::_update_transform_2d_to_mat4(const Transform2D &p_transform, float *p_mat4) { p_mat4[0] = p_transform.columns[0][0]; diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index 22c4ce54ec..3c0184d6a8 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -32,15 +32,10 @@ #ifdef GLES3_ENABLED -#include "drivers/gles3/rasterizer_scene_gles3.h" #include "drivers/gles3/shaders/canvas.glsl.gen.h" #include "drivers/gles3/shaders/canvas_occlusion.glsl.gen.h" #include "drivers/gles3/storage/material_storage.h" -#include "drivers/gles3/storage/texture_storage.h" #include "servers/rendering/renderer_canvas_render.h" -#include "servers/rendering/renderer_compositor.h" - -class RasterizerSceneGLES3; class RasterizerCanvasGLES3 : public RendererCanvasRender { static RasterizerCanvasGLES3 *singleton; diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 25462b266b..9b6338810d 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -36,8 +36,6 @@ #include "core/io/dir_access.h" #include "core/io/image.h" #include "core/os/os.h" -#include "drivers/gles3/storage/texture_storage.h" -#include "drivers/gles3/storage/utilities.h" #define _EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 #define _EXT_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index c9cc20b7b5..ada0af8897 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -38,9 +38,9 @@ #include "drivers/gles3/effects/feed_effects.h" #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/storage/config.h" -#include "drivers/gles3/storage/material_storage.h" #include "drivers/gles3/storage/mesh_storage.h" #include "drivers/gles3/storage/particles_storage.h" +#include "drivers/gles3/storage/render_scene_buffers_gles3.h" #include "drivers/gles3/storage/texture_storage.h" #include "servers/camera/camera_feed.h" #include "servers/camera/camera_server.h" diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 90d58b7f07..06daba39ac 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -36,19 +36,12 @@ #include "core/templates/paged_allocator.h" #include "core/templates/rid_owner.h" #include "core/templates/self_list.h" -#include "drivers/gles3/shader_gles3.h" -#include "drivers/gles3/shaders/effects/cubemap_filter.glsl.gen.h" -#include "drivers/gles3/shaders/sky.glsl.gen.h" #include "drivers/gles3/storage/light_storage.h" #include "drivers/gles3/storage/material_storage.h" -#include "drivers/gles3/storage/render_scene_buffers_gles3.h" -#include "drivers/gles3/storage/utilities.h" -#include "scene/resources/mesh.h" -#include "servers/rendering/renderer_compositor.h" #include "servers/rendering/renderer_scene_render.h" #include "servers/rendering/rendering_server.h" -#include "platform_gl.h" +class RenderSceneBuffersGLES3; enum RenderListType { RENDER_LIST_OPAQUE, //used for opaque objects diff --git a/drivers/gles3/shader_gles3.cpp b/drivers/gles3/shader_gles3.cpp index f43d0a0c87..c1b47bf45c 100644 --- a/drivers/gles3/shader_gles3.cpp +++ b/drivers/gles3/shader_gles3.cpp @@ -34,6 +34,7 @@ #include "core/io/dir_access.h" #include "core/io/file_access.h" +#include "core/string/string_builder.h" #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/storage/config.h" diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index fac5ad8bcc..c0da89a841 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -32,9 +32,7 @@ #ifdef GLES3_ENABLED -#include "core/math/projection.h" -#include "core/os/mutex.h" -#include "core/string/string_builder.h" +#include "core/templates/a_hash_map.h" #include "core/templates/hash_map.h" #include "core/templates/local_vector.h" #include "core/templates/rid_owner.h" @@ -42,6 +40,8 @@ #include "platform_gl.h" +class StringBuilder; + class ShaderGLES3 { public: struct TextureUniformData { @@ -105,8 +105,6 @@ private: LocalVector> variants; }; - Mutex variant_set_mutex; - void _get_uniform_locations(Version::Specialization &spec, Version *p_version); void _compile_specialization(Version::Specialization &spec, uint32_t p_variant, Version *p_version, uint64_t p_specialization); diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp index c893398fe1..328b954239 100644 --- a/drivers/gles3/storage/config.cpp +++ b/drivers/gles3/storage/config.cpp @@ -32,6 +32,8 @@ #ifdef GLES3_ENABLED +#include "core/config/project_settings.h" +#include "core/string/ustring.h" #include "drivers/gles3/rasterizer_gles3.h" #ifdef WEB_ENABLED diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index 4ddfba3c0e..e6bc906a74 100644 --- a/drivers/gles3/storage/config.h +++ b/drivers/gles3/storage/config.h @@ -32,10 +32,12 @@ #ifdef GLES3_ENABLED -#include "core/config/project_settings.h" -#include "core/string/ustring.h" #include "core/templates/hash_set.h" +// FIXME: platform_gl.h includes windows.h via egl.h, which defines ConnectFlags. +// This breaks include project_settings.h in config.cpp, so we include object.h first. +#include "core/object/object.h" + #include "platform_gl.h" #ifdef ANDROID_ENABLED @@ -46,6 +48,8 @@ typedef void (*PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC)(GLenum, GLenu typedef void (*PFNEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum, void *); #endif +class String; + namespace GLES3 { class Config { diff --git a/drivers/gles3/storage/light_storage.cpp b/drivers/gles3/storage/light_storage.cpp index 8c84bc6bef..8429423a49 100644 --- a/drivers/gles3/storage/light_storage.cpp +++ b/drivers/gles3/storage/light_storage.cpp @@ -36,7 +36,7 @@ #include "core/math/geometry_3d.h" #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/rasterizer_scene_gles3.h" -#include "drivers/gles3/storage/texture_storage.h" +#include "drivers/gles3/storage/render_scene_buffers_gles3.h" using namespace GLES3; diff --git a/drivers/gles3/storage/light_storage.h b/drivers/gles3/storage/light_storage.h index 6ce652f746..b9dd5d6969 100644 --- a/drivers/gles3/storage/light_storage.h +++ b/drivers/gles3/storage/light_storage.h @@ -34,13 +34,14 @@ #include "core/templates/local_vector.h" #include "core/templates/rid_owner.h" -#include "drivers/gles3/storage/render_scene_buffers_gles3.h" #include "drivers/gles3/storage/texture_storage.h" #include "servers/rendering/storage/light_storage.h" #include "servers/rendering/storage/utilities.h" #include "platform_gl.h" +class RenderSceneBuffersGLES3; + namespace GLES3 { /* LIGHT */ diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index 4ba0a14dec..e5416d22b2 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -36,7 +36,6 @@ #include "drivers/gles3/rasterizer_canvas_gles3.h" #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/storage/config.h" -#include "drivers/gles3/storage/particles_storage.h" #include "drivers/gles3/storage/texture_storage.h" #include "servers/rendering/storage/variant_converters.h" diff --git a/drivers/gles3/storage/texture_storage.h b/drivers/gles3/storage/texture_storage.h index f47f74778a..aaadc953e1 100644 --- a/drivers/gles3/storage/texture_storage.h +++ b/drivers/gles3/storage/texture_storage.h @@ -33,11 +33,10 @@ #ifdef GLES3_ENABLED #include "core/io/image.h" -#include "core/os/os.h" +#include "core/templates/rb_map.h" #include "core/templates/rid_owner.h" #include "drivers/gles3/shaders/canvas_sdf.glsl.gen.h" #include "drivers/gles3/storage/config.h" -#include "servers/rendering/renderer_compositor.h" #include "servers/rendering/storage/texture_storage.h" #include "platform_gl.h"