Misc dependency improvements for files depending on rendering_server.h

On my machine, this reduces incremental compilation time after an edit of
`rendering_server.h` by 3s.
This commit is contained in:
Rémi Verschelde 2026-02-19 10:50:50 +01:00
parent 25bfae8ff9
commit f0a448540e
No known key found for this signature in database
GPG key ID: C3336907360768E1
35 changed files with 91 additions and 92 deletions

View file

@ -33,7 +33,10 @@
#include "core/crypto/crypto_core.h"
#include "core/io/dir_access.h"
#include "core/io/file_access.h"
#ifdef WINDOWS_ENABLED
#include "drivers/gles3/rasterizer_gles3.h"
#endif
#ifdef EGL_ENABLED

View file

@ -40,7 +40,6 @@
#include "drivers/unix/file_access_unix_pipe.h"
#include "drivers/unix/net_socket_unix.h"
#include "drivers/unix/thread_posix.h"
#include "servers/rendering/rendering_server.h"
#if defined(__APPLE__)
#include <mach-o/dyld.h>

View file

@ -45,36 +45,6 @@
#include "core/string/print_string.h"
#include "core/string/translation_server.h"
#include "core/version.h"
#include "editor/editor_string_names.h"
#include "editor/inspector/editor_context_menu_plugin.h"
#include "editor/plugins/editor_plugin_list.h"
#include "main/main.h"
#include "scene/2d/node_2d.h"
#include "scene/3d/bone_attachment_3d.h"
#include "scene/animation/animation_tree.h"
#include "scene/gui/color_picker.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/menu_bar.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/panel.h"
#include "scene/gui/popup.h"
#include "scene/gui/rich_text_label.h"
#include "scene/gui/split_container.h"
#include "scene/gui/tab_container.h"
#include "scene/main/timer.h"
#include "scene/main/window.h"
#include "scene/property_utils.h"
#include "scene/resources/dpi_texture.h"
#include "scene/resources/image_texture.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/portable_compressed_texture.h"
#include "scene/theme/theme_db.h"
#include "servers/display/display_server.h"
#include "servers/navigation_2d/navigation_server_2d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#include "servers/rendering/rendering_server.h"
#include "editor/animation/animation_player_editor_plugin.h"
#include "editor/asset_library/asset_library_editor_plugin.h"
#include "editor/audio/audio_stream_preview.h"
@ -95,6 +65,7 @@
#include "editor/editor_interface.h"
#include "editor/editor_log.h"
#include "editor/editor_main_screen.h"
#include "editor/editor_string_names.h"
#include "editor/editor_undo_redo_manager.h"
#include "editor/export/dedicated_server_export_plugin.h"
#include "editor/export/editor_export.h"
@ -133,6 +104,7 @@
#include "editor/import/resource_importer_texture.h"
#include "editor/import/resource_importer_texture_atlas.h"
#include "editor/import/resource_importer_wav.h"
#include "editor/inspector/editor_context_menu_plugin.h"
#include "editor/inspector/editor_inspector.h"
#include "editor/inspector/editor_preview_plugins.h"
#include "editor/inspector/editor_properties.h"
@ -141,6 +113,7 @@
#include "editor/inspector/editor_resource_preview.h"
#include "editor/inspector/multi_node_edit.h"
#include "editor/plugins/editor_plugin.h"
#include "editor/plugins/editor_plugin_list.h"
#include "editor/plugins/editor_resource_conversion_plugin.h"
#include "editor/plugins/plugin_config_dialog.h"
#include "editor/project_upgrade/project_upgrade_tool.h"
@ -173,6 +146,32 @@
#include "editor/translations/editor_translation_parser.h"
#include "editor/translations/packed_scene_translation_parser_plugin.h"
#include "editor/version_control/version_control_editor_plugin.h"
#include "main/main.h"
#include "scene/2d/node_2d.h"
#include "scene/3d/bone_attachment_3d.h"
#include "scene/animation/animation_tree.h"
#include "scene/gui/color_picker.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/menu_bar.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/panel.h"
#include "scene/gui/popup.h"
#include "scene/gui/rich_text_label.h"
#include "scene/gui/split_container.h"
#include "scene/gui/tab_container.h"
#include "scene/main/timer.h"
#include "scene/main/window.h"
#include "scene/property_utils.h"
#include "scene/resources/dpi_texture.h"
#include "scene/resources/image_texture.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/portable_compressed_texture.h"
#include "scene/theme/theme_db.h"
#include "servers/display/display_server.h"
#include "servers/navigation_2d/navigation_server_2d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#include "servers/rendering/rendering_server.h"
#ifdef VULKAN_ENABLED
#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h"
@ -186,8 +185,6 @@
#include "editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h"
#endif
#include "modules/modules_enabled.gen.h" // For gdscript, mono.
#ifndef PHYSICS_2D_DISABLED
#include "servers/physics_2d/physics_server_2d.h"
#endif // PHYSICS_2D_DISABLED
@ -200,6 +197,8 @@
#include "editor/gui/touch_actions_panel.h"
#endif // ANDROID_ENABLED
#include "modules/modules_enabled.gen.h" // For gdscript, mono.
#include <cstdlib>
EditorNode *EditorNode::singleton = nullptr;

View file

@ -31,14 +31,12 @@
#include "progress_dialog.h"
#include "core/os/os.h"
#include "editor/editor_interface.h"
#include "editor/editor_node.h"
#include "editor/themes/editor_scale.h"
#include "main/main.h"
#include "scene/gui/panel_container.h"
#include "scene/main/window.h"
#include "servers/display/display_server.h"
#include "servers/rendering/rendering_server.h"
void BackgroundProgress::_add_task(const String &p_task, const String &p_label, int p_steps) {
_THREAD_SAFE_METHOD_

View file

@ -46,12 +46,12 @@
#include "scene/resources/canvas_item_material.h"
#include "scene/resources/particle_process_material.h"
#include "scene/resources/sky.h"
#include "servers/rendering/rendering_server.h"
// 3D.
#include "scene/3d/camera_3d.h"
#include "scene/3d/light_3d.h"
#include "scene/3d/mesh_instance_3d.h"
#include "servers/rendering/rendering_server.h"
Ref<ShaderMaterial> MaterialEditor::make_shader_material(const Ref<Material> &p_from, bool p_copy_params) {
ERR_FAIL_COND_V(p_from.is_null(), Ref<ShaderMaterial>());

View file

@ -30,8 +30,6 @@
#include "image_compress_betsy.h"
#include "core/config/project_settings.h"
#include "betsy_bc1.h"
#include "alpha_stitch.glsl.gen.h"
@ -39,9 +37,20 @@
#include "bc4.glsl.gen.h"
#include "bc6h.glsl.gen.h"
#include "rgb_to_rgba.glsl.gen.h"
#include "core/config/project_settings.h"
#include "servers/display/display_server.h"
#include "servers/rendering/rendering_context_driver.h"
#include "servers/rendering/rendering_device.h"
#include "servers/rendering/rendering_server.h"
#if defined(VULKAN_ENABLED)
#include "drivers/vulkan/rendering_context_driver_vulkan.h"
#endif
#if defined(METAL_ENABLED)
#include "drivers/metal/rendering_context_driver_metal.h"
#endif
static Mutex betsy_mutex;
static BetsyCompressor *betsy = nullptr;

View file

@ -32,18 +32,11 @@
#include "core/io/image.h"
#include "core/object/worker_thread_pool.h"
#include "core/os/thread.h"
#include "core/templates/command_queue_mt.h"
#include "servers/rendering/rendering_device_binds.h" // RDShaderFile
#include "servers/rendering/rendering_device_binds.h"
#include "servers/rendering/rendering_server_default.h"
#if defined(VULKAN_ENABLED)
#include "drivers/vulkan/rendering_context_driver_vulkan.h"
#endif
#if defined(METAL_ENABLED)
#include "drivers/metal/rendering_context_driver_metal.h"
#endif
class RenderingDevice;
class RenderingContextDriver;
enum BetsyFormat {
BETSY_FORMAT_BC1,

View file

@ -30,13 +30,15 @@
#include "csg_shape.h"
#ifdef DEV_ENABLED
#include "core/io/json.h"
#endif // DEV_ENABLED
#include "core/math/geometry_2d.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/navigation_mesh.h"
#include "servers/rendering/rendering_server.h"
#ifdef DEV_ENABLED
#include "core/io/json.h"
#endif // DEV_ENABLED
#ifndef NAVIGATION_3D_DISABLED
#include "servers/navigation_3d/navigation_server_3d.h"
#endif // NAVIGATION_3D_DISABLED

View file

@ -33,6 +33,7 @@
#include "core/io/file_access.h"
#include "core/io/file_access_memory.h"
#include "scene/resources/image_texture.h"
#include "scene/resources/texture.h"
#include "servers/rendering/rendering_server.h"
#include <ktx.h>

View file

@ -31,7 +31,6 @@
#pragma once
#include "core/io/resource_loader.h"
#include "scene/resources/texture.h"
class ResourceFormatKTX : public ResourceFormatLoader {
GDSOFTCLASS(ResourceFormatKTX, ResourceFormatLoader);

View file

@ -41,6 +41,7 @@
#include "core/math/geometry_3d.h"
#include "editor/file_system/editor_paths.h"
#include "editor/settings/editor_settings.h"
#include "servers/rendering/rendering_device.h"
#include "servers/rendering/rendering_device_binds.h"
#include "servers/rendering/rendering_server.h"
#include "servers/rendering/rendering_server_globals.h"

View file

@ -36,8 +36,8 @@
#include "core/string/print_string.h"
#include "servers/rendering/renderer_rd/effects/copy_effects.h"
#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
#include "servers/rendering/rendering_device.h"
#include "servers/rendering/rendering_server.h"
#include "servers/rendering/rendering_server_globals.h"
HashMap<String, bool *> OpenXRVulkanExtension::get_requested_extensions(XrVersion p_version) {
HashMap<String, bool *> request_extensions;

View file

@ -31,8 +31,8 @@
#include "raycast_occlusion_cull.h"
#include "core/config/project_settings.h"
#include "core/math/projection.h"
#include "core/object/worker_thread_pool.h"
#include "core/templates/local_vector.h"
#ifdef __SSE2__
#include <pmmintrin.h>

View file

@ -30,13 +30,15 @@
#pragma once
#include "core/math/projection.h"
#include "core/templates/hash_set.h"
#include "core/templates/local_vector.h"
#include "core/templates/rid_owner.h"
#include "servers/rendering/renderer_scene_occlusion_cull.h"
#include <embree4/rtcore.h>
struct Projection;
class RaycastOcclusionCull : public RendererSceneOcclusionCull {
typedef RTCRayHit16 CameraRayTile;

View file

@ -35,8 +35,6 @@
#include "webxr_interface.h"
#include "core/templates/rb_map.h"
#include "servers/xr/xr_controller_tracker.h"
#include "servers/xr/xr_hand_tracker.h"
/**
The WebXR interface is a VR/AR interface that can be used on the web.
@ -46,6 +44,8 @@ namespace GLES3 {
class TextureStorage;
}
class XRHandTracker;
class WebXRInterfaceJS : public WebXRInterface {
GDCLASS(WebXRInterfaceJS, WebXRInterface);

View file

@ -29,6 +29,7 @@
/**************************************************************************/
#include "decal.h"
#include "servers/rendering/rendering_server.h"
void Decal::set_size(const Vector3 &p_size) {

View file

@ -36,7 +36,6 @@
#include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/3d/world_boundary_shape_3d.h"
#include "servers/rendering/rendering_server.h"
void CollisionShape3D::make_convex_from_siblings() {
Node *p = get_parent();
@ -321,11 +320,9 @@ void CollisionShape3D::_shape_changed() {
#endif // DEBUG_ENABLED
CollisionShape3D::CollisionShape3D() {
//indicator = RenderingServer::get_singleton()->mesh_create();
set_notify_local_transform(true);
debug_color = _get_default_debug_color();
}
CollisionShape3D::~CollisionShape3D() {
//RenderingServer::get_singleton()->free(indicator);
}

View file

@ -32,7 +32,6 @@
#include "core/variant/typed_array.h"
#include "servers/camera/camera_feed.h"
#include "servers/rendering/rendering_server.h"
////////////////////////////////////////////////////////
// CameraServer

View file

@ -30,11 +30,10 @@
#pragma once
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/object/ref_counted.h"
#include "core/os/thread_safe.h"
#include "core/templates/rid.h"
#include "core/variant/variant.h"
/**
The camera server is a singleton object that gives access to the various

View file

@ -30,9 +30,6 @@
#pragma once
#include "core/templates/rid_owner.h"
#include "core/templates/self_list.h"
#include "scene/resources/mesh.h"
#include "servers/rendering/dummy/environment/fog.h"
#include "servers/rendering/dummy/environment/gi.h"
#include "servers/rendering/dummy/rasterizer_canvas_dummy.h"
@ -44,7 +41,6 @@
#include "servers/rendering/dummy/storage/texture_storage.h"
#include "servers/rendering/dummy/storage/utilities.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering/rendering_server.h"
class RasterizerDummy : public RendererCompositor {
private:
@ -54,15 +50,16 @@ private:
protected:
RasterizerCanvasDummy canvas;
RendererDummy::Utilities utilities;
RasterizerSceneDummy scene;
RendererDummy::Fog fog;
RendererDummy::GI gi;
RendererDummy::LightStorage light_storage;
RendererDummy::MaterialStorage material_storage;
RendererDummy::MeshStorage mesh_storage;
RendererDummy::ParticlesStorage particles_storage;
RendererDummy::TextureStorage texture_storage;
RendererDummy::GI gi;
RendererDummy::Fog fog;
RasterizerSceneDummy scene;
RendererDummy::Utilities utilities;
public:
RendererUtilities *get_utilities() override { return &utilities; }

View file

@ -29,9 +29,11 @@
/**************************************************************************/
#include "bokeh_dof.h"
#include "copy_effects.h"
#include "servers/rendering/renderer_rd/effects/copy_effects.h"
#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
#include "servers/rendering/rendering_server_globals.h"
#include "servers/rendering/storage/camera_attributes_storage.h"
using namespace RendererRD;

View file

@ -44,9 +44,6 @@
#include "servers/rendering/renderer_rd/shaders/effects/octmap_roughness.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/octmap_roughness_raster.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/specular_merge.glsl.gen.h"
#include "servers/rendering/renderer_scene_render.h"
#include "servers/rendering/rendering_server.h"
namespace RendererRD {

View file

@ -29,9 +29,11 @@
/**************************************************************************/
#include "debug_effects.h"
#include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
#include "servers/rendering/rendering_server_globals.h"
using namespace RendererRD;

View file

@ -30,11 +30,8 @@
#pragma once
#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
#include "servers/rendering/renderer_rd/shaders/effects/motion_vectors_store.glsl.gen.h"
#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
#include "servers/rendering/renderer_scene_render.h"
#include "servers/rendering/rendering_server.h"
namespace RendererRD {
class MotionVectorsStore {

View file

@ -35,9 +35,6 @@
#include "servers/rendering/renderer_rd/shaders/effects/smaa_edge_detection.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/smaa_weight_calculation.glsl.gen.h"
#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
#include "servers/rendering/renderer_scene_render.h"
#include "servers/rendering/rendering_server.h"
#define RB_SCOPE_SMAA SNAME("rb_smaa")

View file

@ -46,7 +46,6 @@
#include "servers/rendering/renderer_rd/shaders/effects/ssil_importance_map.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/ssil_interleave.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/subsurface_scattering.glsl.gen.h"
#include "servers/rendering/rendering_server.h"
#define RB_SCOPE_SSLF SNAME("rb_sslf")
#define RB_SCOPE_SSDS SNAME("rb_ssds")

View file

@ -34,8 +34,6 @@
#include "servers/rendering/renderer_rd/shaders/effects/tonemap.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl.gen.h"
#include "servers/rendering/rendering_server.h"
namespace RendererRD {
class ToneMapper {

View file

@ -29,10 +29,12 @@
/**************************************************************************/
#include "light_storage.h"
#include "core/config/project_settings.h"
#include "core/math/geometry_3d.h"
#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
#include "texture_storage.h"
#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
#include "servers/rendering/rendering_server_globals.h"
using namespace RendererRD;

View file

@ -29,9 +29,11 @@
/**************************************************************************/
#include "render_scene_data_rd.h"
#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
#include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
#include "servers/rendering/rendering_server_globals.h"
Transform3D RenderSceneDataRD::get_cam_transform() const {
return cam_transform;

View file

@ -38,6 +38,7 @@
#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.h"
#include "servers/rendering/rendering_server_globals.h"
using namespace RendererRD;

View file

@ -35,7 +35,7 @@
#include "servers/rendering/renderer_rd/shaders/canvas_sdf.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/tex_blit.glsl.gen.h"
#include "servers/rendering/renderer_rd/storage_rd/forward_id_storage.h"
#include "servers/rendering/rendering_server_default.h"
#include "servers/rendering/rendering_server.h"
#include "servers/rendering/shader_compiler.h"
#include "servers/rendering/storage/texture_storage.h"
#include "servers/rendering/storage/utilities.h"

View file

@ -30,6 +30,8 @@
#include "renderer_scene_occlusion_cull.h"
#include "servers/rendering/rendering_server.h"
RendererSceneOcclusionCull *RendererSceneOcclusionCull::singleton = nullptr;
bool RendererSceneOcclusionCull::HZBuffer::occlusion_jitter_enabled = false;

View file

@ -30,9 +30,10 @@
#pragma once
#include "core/io/image.h"
#include "core/math/projection.h"
#include "core/templates/local_vector.h"
#include "servers/rendering/rendering_server.h"
#include "servers/rendering/rendering_server_enums.h"
class RendererSceneOcclusionCull {
protected:

View file

@ -102,7 +102,7 @@ void XRVRS::set_vrs_render_region(const Rect2i &p_vrs_render_region) {
vrs_dirty = true;
}
RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci) {
RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const Vector<Vector2> &p_eye_foci) {
ERR_FAIL_COND_V(p_eye_foci.is_empty(), RID());
Size2i texel_size = RD::get_singleton()->vrs_get_texel_size();

View file

@ -30,10 +30,10 @@
#pragma once
#include "core/object/class_db.h"
#include "core/math/vector2i.h"
#include "core/object/object.h"
#include "core/templates/rid.h"
#include "core/variant/variant.h"
#include "core/templates/vector.h"
/* This is a helper class for generating stereoscopic VRS images */
@ -48,7 +48,7 @@ private:
RID vrs_texture;
Size2i target_size;
PackedVector2Array eye_foci;
Vector<Vector2> eye_foci;
protected:
static void _bind_methods();
@ -63,5 +63,5 @@ public:
Rect2i get_vrs_render_region() const;
void set_vrs_render_region(const Rect2i &p_vrs_render_region);
RID make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci);
RID make_vrs_texture(const Size2 &p_target_size, const Vector<Vector2> &p_eye_foci);
};