Merge pull request #117295 from akien-mga/clangd-unused-includes-servers

Remove unused includes in `servers` with clangd-tidy

servers/audio/audio_effect.cpp

@@ -30,7 +30,7 @@
 
 #include "audio_effect.h"
 
-#include "core/object/class_db.h"
+#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 
 void AudioEffectInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	GDVIRTUAL_CALL(_process, p_src_frames, p_dst_frames, p_frame_count);

servers/audio/effects/eq_filter.cpp

@@ -49,7 +49,7 @@ static int solve_quadratic(double a, double b, double c, double *r1, double *r2)
 		return 0;
 	}
 
-	squared = std::sqrt(squared);
+	squared = Math::sqrt(squared);
 
 	*r1 = (-b + squared) / base;
 	*r2 = (-b - squared) / base;
@@ -67,7 +67,7 @@ EQ::BandProcess::BandProcess() {
 }
 
 void EQ::recalculate_band_coefficients() {
-#define BAND_LOG(m_f) (std::log((m_f)) / std::log(2.))
+#define BAND_LOG(m_f) (Math::log((m_f)) / Math::log(2.))
 
 	for (int i = 0; i < band.size(); i++) {
 		double octave_size;
@@ -84,17 +84,17 @@ void EQ::recalculate_band_coefficients() {
 			octave_size = (next + prev) / 2.0;
 		}
 
-		double frq_l = std::round(frq / std::pow(2.0, octave_size / 2.0));
+		double frq_l = Math::round(frq / Math::pow(2.0, octave_size / 2.0));
 
 		double side_gain2 = POW2(Math::SQRT12);
 		double th = Math::TAU * frq / mix_rate;
 		double th_l = Math::TAU * frq_l / mix_rate;
 
-		double c2a = side_gain2 * POW2(std::cos(th)) - 2.0 * side_gain2 * std::cos(th_l) * std::cos(th) + side_gain2 - POW2(std::sin(th_l));
+		double c2a = side_gain2 * POW2(Math::cos(th)) - 2.0 * side_gain2 * Math::cos(th_l) * Math::cos(th) + side_gain2 - POW2(Math::sin(th_l));
 
-		double c2b = 2.0 * side_gain2 * POW2(std::cos(th_l)) + side_gain2 * POW2(std::cos(th)) - 2.0 * side_gain2 * std::cos(th_l) * std::cos(th) - side_gain2 + POW2(std::sin(th_l));
+		double c2b = 2.0 * side_gain2 * POW2(Math::cos(th_l)) + side_gain2 * POW2(Math::cos(th)) - 2.0 * side_gain2 * Math::cos(th_l) * Math::cos(th) - side_gain2 + POW2(Math::sin(th_l));
 
-		double c2c = 0.25 * side_gain2 * POW2(std::cos(th)) - 0.5 * side_gain2 * std::cos(th_l) * std::cos(th) + 0.25 * side_gain2 - 0.25 * POW2(std::sin(th_l));
+		double c2c = 0.25 * side_gain2 * POW2(Math::cos(th)) - 0.5 * side_gain2 * Math::cos(th_l) * Math::cos(th) + 0.25 * side_gain2 - 0.25 * POW2(Math::sin(th_l));
 
 		//printf("band %i, precoefs = %f,%f,%f\n",i,c2a,c2b,c2c);
 
@@ -107,7 +107,7 @@ void EQ::recalculate_band_coefficients() {
 
 		band.write[i].c1 = 2.0 * ((0.5 - r1) / 2.0);
 		band.write[i].c2 = 2.0 * r1;
-		band.write[i].c3 = 2.0 * (0.5 + r1) * std::cos(th);
+		band.write[i].c3 = 2.0 * (0.5 + r1) * Math::cos(th);
 		//printf("band %i, coefs = %f,%f,%f\n",i,(float)bands[i].c1,(float)bands[i].c2,(float)bands[i].c3);
 	}
 }

servers/navigation_2d/navigation_server_2d.cpp

@@ -35,7 +35,7 @@
 #include "core/config/project_settings.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
-#include "scene/main/node.h"
+#include "scene/main/node.h" // IWYU pragma: keep. Needed to bind `Node *` arg.
 #include "servers/navigation_2d/navigation_server_2d_dummy.h"
 
 NavigationServer2D *NavigationServer2D::singleton = nullptr;

servers/navigation_2d/navigation_server_2d.h

@@ -31,12 +31,13 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
 #include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
+class Node;
+
 #ifdef CLIPPER2_ENABLED
 class NavMeshGenerator2D;
 #endif // CLIPPER2_ENABLED

servers/navigation_3d/navigation_server_3d.cpp

@@ -35,7 +35,7 @@
 #include "core/config/project_settings.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
-#include "scene/main/node.h"
+#include "scene/main/node.h" // IWYU pragma: keep. Needed to bind `Node *` arg.
 #include "servers/navigation_3d/navigation_server_3d_dummy.h"
 
 NavigationServer3D *NavigationServer3D::singleton = nullptr;

servers/navigation_3d/navigation_server_3d.h

@@ -37,6 +37,8 @@
 #include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
 #include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
+class Node;
+
 struct NavMeshGeometryParser3D {
 	RID self;
 	Callable callback;

servers/rendering/dummy/environment/fog.h

@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "core/math/aabb.h"
+#include "core/templates/rid.h"
 #include "servers/rendering/environment/renderer_fog.h"
 
 namespace RendererDummy {

servers/rendering/dummy/environment/gi.h

@@ -30,6 +30,10 @@
 
 #pragma once
 
+#include "core/math/aabb.h"
+#include "core/math/transform_3d.h"
+#include "core/math/vector3i.h"
+#include "core/templates/rid.h"
 #include "servers/rendering/environment/renderer_gi.h"
 
 namespace RendererDummy {

servers/rendering/dummy/storage/particles_storage.h

@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "core/math/transform_3d.h"
+#include "core/templates/rid.h"
 #include "servers/rendering/storage/particles_storage.h"
 
 namespace RendererDummy {

servers/rendering/renderer_rd/cluster_builder_rd.cpp

@@ -29,8 +29,9 @@
 /**************************************************************************/
 
 #include "cluster_builder_rd.h"
+
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_globals.h"
+#include "servers/rendering/rendering_server_globals.h" // IWYU pragma: keep. RENDER_TIMESTAMP macro uses RSG.
 
 ClusterBuilderSharedDataRD::ClusterBuilderSharedDataRD() {
 	RD::VertexFormatID vertex_format;

servers/rendering/renderer_rd/effects/smaa.cpp

@@ -31,10 +31,9 @@
 #include "smaa.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/image_loader.h"
 #include "servers/rendering/renderer_rd/effects/smaa_area_tex.gen.h"
 #include "servers/rendering/renderer_rd/effects/smaa_search_tex.gen.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"

servers/rendering/renderer_rd/effects/sort_effects.h

@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "servers/rendering/renderer_rd/shader_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/sort.glsl.gen.h"
 
 namespace RendererRD {

servers/rendering/renderer_rd/environment/gi.cpp

@@ -32,12 +32,12 @@
 
 #include "core/config/project_settings.h"
 #include "core/math/geometry_3d.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+#include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_default.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 using namespace RendererRD;
 

servers/rendering/renderer_rd/renderer_scene_render_rd.cpp

@@ -33,10 +33,11 @@
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
 #include "servers/rendering/renderer_rd/environment/fog.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/decal_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/light_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/scene_data_inc.glsl.gen.h"
+#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/rendering_server_enums.h"

servers/rendering/renderer_rd/storage_rd/light_storage.h

@@ -30,10 +30,8 @@
 
 #pragma once
 
-#include "core/templates/local_vector.h"
 #include "core/templates/paged_array.h"
 #include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/renderer_rd/cluster_builder_rd.h"
 #include "servers/rendering/renderer_rd/environment/sky.h"
 #include "servers/rendering/renderer_rd/storage_rd/forward_id_storage.h"

servers/rendering/renderer_rd/storage_rd/texture_storage.cpp

@@ -37,7 +37,6 @@
 #include "core/config/engine.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 using namespace RendererRD;

servers/rendering/renderer_scene_cull.cpp

@@ -35,21 +35,20 @@
 #include "core/math/geometry_3d.h"
 #include "core/object/callable_mp.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "servers/rendering/rendering_light_culler.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_default.h"
 
-#if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
-// This is used only to obtain node paths for user-friendly physics interpolation warnings.
-#include "scene/main/node.h"
-#endif
-
 #ifndef XR_DISABLED
 #include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_server.h"
 #endif
 
+//#define DEBUG_CULL_TIME
+#ifdef DEBUG_CULL_TIME
+#include "core/os/os.h"
+#endif
+
 /* HALTON SEQUENCE */
 
 #ifndef _3D_DISABLED
@@ -3334,7 +3333,6 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 		cull_data.occlusion_buffer = RendererSceneOcclusionCull::get_singleton()->buffer_get_ptr(p_viewport);
 		cull_data.camera_matrix = &p_camera_data->main_projection;
 		cull_data.visibility_viewport_mask = scenario->viewport_visibility_masks.has(p_viewport) ? scenario->viewport_visibility_masks[p_viewport] : 0;
-//#define DEBUG_CULL_TIME
 #ifdef DEBUG_CULL_TIME
 		uint64_t time_from = OS::get_singleton()->get_ticks_usec();
 #endif

servers/rendering/renderer_viewport.cpp

@@ -39,8 +39,9 @@
 #include "servers/display/display_server.h"
 #include "servers/rendering/renderer_canvas_cull.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/renderer_scene_cull.h"
+#include "servers/rendering/renderer_scene_occlusion_cull.h"
 #include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/texture_storage.h"
 

servers/rendering/rendering_device_commons.h

@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/object.h"
-#include "core/variant/type_info.h"
 
 #define STEPIFY(m_number, m_alignment) ((((m_number) + ((m_alignment) - 1)) / (m_alignment)) * (m_alignment))
 

servers/rendering/rendering_device_driver.h

@@ -47,7 +47,6 @@
 
 #include "core/object/object.h"
 #include "core/templates/paged_allocator.h"
-#include "core/variant/type_info.h"
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device_commons.h"
 

servers/rendering/rendering_light_culler.cpp

@@ -30,11 +30,14 @@
 
 #include "rendering_light_culler.h"
 
-#include "core/config/engine.h"
 #include "core/math/plane.h"
 #include "core/math/projection.h"
 #include "rendering_server_globals.h"
 
+#ifdef LIGHT_CULLER_DEBUG_FLASH
+#include "core/config/engine.h"
+#endif
+
 #ifdef RENDERING_LIGHT_CULLER_DEBUG_STRINGS
 const char *RenderingLightCuller::Data::string_planes[] = {
 	"NEAR",

servers/rendering/storage/particles_storage.h

@@ -30,8 +30,18 @@
 
 #pragma once
 
+#include "core/math/math_defs.h" // real_t
 #include "servers/rendering/rendering_server_enums.h"
 
+class RID;
+struct AABB;
+struct Color;
+struct Transform3D;
+struct Vector3;
+
+template <typename T>
+class Vector;
+
 class RendererParticlesStorage {
 public:
 	virtual ~RendererParticlesStorage() {}

servers/rendering/storage/render_data_extension.cpp

@@ -30,10 +30,9 @@
 
 #include "render_data_extension.h"
 
+#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 #include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
 
-#include "core/object/class_db.h"
-
 // RenderSceneBuffersExtension
 
 void RenderSceneBuffersExtension::_bind_methods() {

servers/server_wrap_mt_common.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "core/config/engine.h"
-
 #ifdef DEBUG_ENABLED
+#include "core/config/engine.h" // IWYU pragma: keep. Used in macro.
+
 #define MAIN_THREAD_SYNC_CHECK \
 	if (unlikely(Thread::is_main_thread() && Engine::get_singleton()->notify_frame_server_synced())) { \
 		MAIN_THREAD_SYNC_WARN \

servers/text/text_server_extension.cpp

@@ -30,7 +30,7 @@
 
 #include "text_server_extension.h"
 
-#include "core/object/class_db.h"
+#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 
 void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_has_feature, "feature");