From 985e6178b45232f1d462f5eb0577adf3db2a09a8 Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Fri, 10 Oct 2025 17:19:55 +0200 Subject: [PATCH] Remove extraneous includes from `texture.h`. --- editor/scene/3d/node_3d_editor_plugin.h | 1 + editor/scene/gradient_editor_plugin.h | 1 + editor/themes/editor_fonts.cpp | 1 + modules/ktx/texture_loader_ktx.cpp | 1 + modules/noise/noise_texture_2d.cpp | 2 ++ modules/noise/noise_texture_2d.h | 1 + modules/noise/noise_texture_3d.cpp | 2 ++ modules/noise/noise_texture_3d.h | 1 + modules/text_server_adv/text_server_adv.cpp | 1 + modules/text_server_fb/text_server_fb.cpp | 1 + scene/2d/cpu_particles_2d.h | 1 + scene/2d/line_2d.h | 3 ++- scene/3d/cpu_particles_3d.h | 1 + scene/main/canvas_item.h | 1 + scene/resources/animated_texture.cpp | 3 +++ scene/resources/bone_map.cpp | 2 ++ scene/resources/camera_texture.cpp | 1 + scene/resources/camera_texture.h | 1 + scene/resources/compressed_texture.h | 1 + scene/resources/curve_texture.cpp | 2 ++ scene/resources/external_texture.cpp | 2 ++ scene/resources/font.cpp | 1 + scene/resources/gradient_texture.cpp | 1 + scene/resources/gradient_texture.h | 1 + scene/resources/image_texture.cpp | 1 + scene/resources/placeholder_textures.cpp | 2 ++ scene/resources/portable_compressed_texture.cpp | 1 + scene/resources/skeleton_profile.cpp | 2 ++ scene/resources/style_box_texture.cpp | 2 ++ scene/resources/texture.cpp | 1 + scene/resources/texture.h | 6 ++---- scene/resources/texture_rd.cpp | 2 ++ servers/display/display_server.h | 6 +++--- 33 files changed, 48 insertions(+), 8 deletions(-) diff --git a/editor/scene/3d/node_3d_editor_plugin.h b/editor/scene/3d/node_3d_editor_plugin.h index 22322a12bff..de14c1e82ec 100644 --- a/editor/scene/3d/node_3d_editor_plugin.h +++ b/editor/scene/3d/node_3d_editor_plugin.h @@ -37,6 +37,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/spin_box.h" +#include "scene/resources/gradient.h" #include "scene/resources/immediate_mesh.h" class AcceptDialog; diff --git a/editor/scene/gradient_editor_plugin.h b/editor/scene/gradient_editor_plugin.h index 2f945394f70..4008391aee6 100644 --- a/editor/scene/gradient_editor_plugin.h +++ b/editor/scene/gradient_editor_plugin.h @@ -32,6 +32,7 @@ #include "editor/inspector/editor_inspector.h" #include "editor/plugins/editor_plugin.h" +#include "scene/resources/gradient.h" class EditorSpinSlider; class ColorPicker; diff --git a/editor/themes/editor_fonts.cpp b/editor/themes/editor_fonts.cpp index bcdff1e388f..9de9c74e620 100644 --- a/editor/themes/editor_fonts.cpp +++ b/editor/themes/editor_fonts.cpp @@ -31,6 +31,7 @@ #include "editor_fonts.h" #include "core/io/dir_access.h" +#include "core/os/os.h" #include "editor/editor_string_names.h" #include "editor/settings/editor_settings.h" #include "editor/themes/builtin_fonts.gen.h" diff --git a/modules/ktx/texture_loader_ktx.cpp b/modules/ktx/texture_loader_ktx.cpp index aa8b3d63e6f..83176e71ca5 100644 --- a/modules/ktx/texture_loader_ktx.cpp +++ b/modules/ktx/texture_loader_ktx.cpp @@ -33,6 +33,7 @@ #include "core/io/file_access.h" #include "core/io/file_access_memory.h" #include "scene/resources/image_texture.h" +#include "servers/rendering/rendering_server.h" #include #include diff --git a/modules/noise/noise_texture_2d.cpp b/modules/noise/noise_texture_2d.cpp index 7e1ab40347d..c0f74dd8a4c 100644 --- a/modules/noise/noise_texture_2d.cpp +++ b/modules/noise/noise_texture_2d.cpp @@ -32,6 +32,8 @@ #include "noise.h" +#include "servers/rendering/rendering_server.h" + NoiseTexture2D::NoiseTexture2D() { noise = Ref(); diff --git a/modules/noise/noise_texture_2d.h b/modules/noise/noise_texture_2d.h index e0c163f3bd4..44786aa6fc0 100644 --- a/modules/noise/noise_texture_2d.h +++ b/modules/noise/noise_texture_2d.h @@ -33,6 +33,7 @@ #include "noise.h" #include "core/object/ref_counted.h" +#include "scene/resources/gradient.h" #include "scene/resources/texture.h" class NoiseTexture2D : public Texture2D { diff --git a/modules/noise/noise_texture_3d.cpp b/modules/noise/noise_texture_3d.cpp index 3151e0df772..117626713a6 100644 --- a/modules/noise/noise_texture_3d.cpp +++ b/modules/noise/noise_texture_3d.cpp @@ -32,6 +32,8 @@ #include "noise.h" +#include "servers/rendering/rendering_server.h" + NoiseTexture3D::NoiseTexture3D() { noise = Ref(); diff --git a/modules/noise/noise_texture_3d.h b/modules/noise/noise_texture_3d.h index 4a0e887baf3..245901ddbdf 100644 --- a/modules/noise/noise_texture_3d.h +++ b/modules/noise/noise_texture_3d.h @@ -33,6 +33,7 @@ #include "noise.h" #include "core/object/ref_counted.h" +#include "scene/resources/gradient.h" #include "scene/resources/texture.h" class NoiseTexture3D : public Texture3D { diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index 4eea248a32d..7d6ea54e332 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -53,6 +53,7 @@ using namespace godot; #include "core/object/worker_thread_pool.h" #include "core/string/translation_server.h" #include "scene/resources/image_texture.h" +#include "servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg. diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 3b2c4bd82ec..eb892c61372 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -54,6 +54,7 @@ using namespace godot; #include "core/io/file_access.h" #include "core/string/print_string.h" #include "core/string/translation_server.h" +#include "servers/rendering/rendering_server.h" #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg. diff --git a/scene/2d/cpu_particles_2d.h b/scene/2d/cpu_particles_2d.h index dc034d1a25b..b9310c95d64 100644 --- a/scene/2d/cpu_particles_2d.h +++ b/scene/2d/cpu_particles_2d.h @@ -31,6 +31,7 @@ #pragma once #include "scene/2d/node_2d.h" +#include "scene/resources/gradient.h" class RandomNumberGenerator; diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h index 0d081b33563..0c73f58da57 100644 --- a/scene/2d/line_2d.h +++ b/scene/2d/line_2d.h @@ -30,7 +30,8 @@ #pragma once -#include "node_2d.h" +#include "scene/2d/node_2d.h" +#include "scene/resources/gradient.h" class Line2D : public Node2D { GDCLASS(Line2D, Node2D); diff --git a/scene/3d/cpu_particles_3d.h b/scene/3d/cpu_particles_3d.h index 748a0e75468..20d84077a63 100644 --- a/scene/3d/cpu_particles_3d.h +++ b/scene/3d/cpu_particles_3d.h @@ -31,6 +31,7 @@ #pragma once #include "scene/3d/visual_instance_3d.h" +#include "scene/resources/gradient.h" class RandomNumberGenerator; diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h index 2e64569e376..9e4558ee0f3 100644 --- a/scene/main/canvas_item.h +++ b/scene/main/canvas_item.h @@ -32,6 +32,7 @@ #include "scene/main/node.h" #include "scene/resources/font.h" +#include "servers/rendering/rendering_server.h" class CanvasLayer; class MultiMesh; diff --git a/scene/resources/animated_texture.cpp b/scene/resources/animated_texture.cpp index cef4c629b2c..00ae64799c9 100644 --- a/scene/resources/animated_texture.cpp +++ b/scene/resources/animated_texture.cpp @@ -30,6 +30,9 @@ #include "animated_texture.h" +#include "core/os/os.h" +#include "servers/rendering/rendering_server.h" + void AnimatedTexture::_update_proxy() { RWLockRead r(rw_lock); diff --git a/scene/resources/bone_map.cpp b/scene/resources/bone_map.cpp index 84b6494c15a..4c0c2d5d791 100644 --- a/scene/resources/bone_map.cpp +++ b/scene/resources/bone_map.cpp @@ -30,6 +30,8 @@ #include "bone_map.h" +#include "core/config/engine.h" + bool BoneMap::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; if (path.begins_with("bone_map/")) { diff --git a/scene/resources/camera_texture.cpp b/scene/resources/camera_texture.cpp index 850dc7428e8..9b10727fa57 100644 --- a/scene/resources/camera_texture.cpp +++ b/scene/resources/camera_texture.cpp @@ -31,6 +31,7 @@ #include "camera_texture.h" #include "servers/camera/camera_feed.h" +#include "servers/rendering/rendering_server.h" void CameraTexture::_bind_methods() { ClassDB::bind_method(D_METHOD("set_camera_feed_id", "feed_id"), &CameraTexture::set_camera_feed_id); diff --git a/scene/resources/camera_texture.h b/scene/resources/camera_texture.h index 0e91e71be3e..f071a7e6130 100644 --- a/scene/resources/camera_texture.h +++ b/scene/resources/camera_texture.h @@ -31,6 +31,7 @@ #pragma once #include "scene/resources/texture.h" +#include "servers/camera/camera_server.h" class CameraTexture : public Texture2D { GDCLASS(CameraTexture, Texture2D); diff --git a/scene/resources/compressed_texture.h b/scene/resources/compressed_texture.h index a481b9c8f28..6d2c7bceb00 100644 --- a/scene/resources/compressed_texture.h +++ b/scene/resources/compressed_texture.h @@ -32,6 +32,7 @@ #include "core/io/resource_loader.h" #include "scene/resources/texture.h" +#include "servers/rendering/rendering_server.h" class BitMap; diff --git a/scene/resources/curve_texture.cpp b/scene/resources/curve_texture.cpp index cdc9f986bad..04f74dd0749 100644 --- a/scene/resources/curve_texture.cpp +++ b/scene/resources/curve_texture.cpp @@ -30,6 +30,8 @@ #include "curve_texture.h" +#include "servers/rendering/rendering_server.h" + void CurveTexture::_bind_methods() { ClassDB::bind_method(D_METHOD("set_width", "width"), &CurveTexture::set_width); diff --git a/scene/resources/external_texture.cpp b/scene/resources/external_texture.cpp index a53e00f3100..45d1f723e15 100644 --- a/scene/resources/external_texture.cpp +++ b/scene/resources/external_texture.cpp @@ -30,6 +30,8 @@ #include "external_texture.h" +#include "servers/rendering/rendering_server.h" + void ExternalTexture::_bind_methods() { ClassDB::bind_method(D_METHOD("set_size", "size"), &ExternalTexture::set_size); ClassDB::bind_method(D_METHOD("get_external_texture_id"), &ExternalTexture::get_external_texture_id); diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index 904d73cf3d0..c8629b0e98c 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -39,6 +39,7 @@ #include "scene/resources/text_paragraph.h" #include "scene/resources/theme.h" #include "scene/theme/theme_db.h" +#include "servers/rendering/rendering_server.h" /*************************************************************************/ /* Font */ diff --git a/scene/resources/gradient_texture.cpp b/scene/resources/gradient_texture.cpp index 340ddc945a9..183e46fb4fa 100644 --- a/scene/resources/gradient_texture.cpp +++ b/scene/resources/gradient_texture.cpp @@ -31,6 +31,7 @@ #include "gradient_texture.h" #include "core/math/geometry_2d.h" +#include "servers/rendering/rendering_server.h" GradientTexture1D::GradientTexture1D() { _queue_update(); diff --git a/scene/resources/gradient_texture.h b/scene/resources/gradient_texture.h index f06aeb7551d..8b785fa775b 100644 --- a/scene/resources/gradient_texture.h +++ b/scene/resources/gradient_texture.h @@ -30,6 +30,7 @@ #pragma once +#include "scene/resources/gradient.h" #include "scene/resources/texture.h" class GradientTexture1D : public Texture2D { diff --git a/scene/resources/image_texture.cpp b/scene/resources/image_texture.cpp index 83f175c5117..f6606a841dc 100644 --- a/scene/resources/image_texture.cpp +++ b/scene/resources/image_texture.cpp @@ -33,6 +33,7 @@ #include "core/io/image_loader.h" #include "scene/resources/bit_map.h" #include "scene/resources/placeholder_textures.h" +#include "servers/rendering/rendering_server.h" void ImageTexture::reload_from_file() { String path = ResourceLoader::path_remap(get_path()); diff --git a/scene/resources/placeholder_textures.cpp b/scene/resources/placeholder_textures.cpp index ee37f367721..159e923b675 100644 --- a/scene/resources/placeholder_textures.cpp +++ b/scene/resources/placeholder_textures.cpp @@ -30,6 +30,8 @@ #include "placeholder_textures.h" +#include "servers/rendering/rendering_server.h" + void PlaceholderTexture2D::set_size(Size2 p_size) { size = p_size; emit_changed(); diff --git a/scene/resources/portable_compressed_texture.cpp b/scene/resources/portable_compressed_texture.cpp index 9d2a3ccd8ee..e354e168ba9 100644 --- a/scene/resources/portable_compressed_texture.cpp +++ b/scene/resources/portable_compressed_texture.cpp @@ -33,6 +33,7 @@ #include "core/config/project_settings.h" #include "core/io/marshalls.h" #include "scene/resources/bit_map.h" +#include "servers/rendering/rendering_server.h" static const char *compression_mode_names[7] = { "Lossless", "Lossy", "Basis Universal", "S3TC", "ETC2", "BPTC", "ASTC" diff --git a/scene/resources/skeleton_profile.cpp b/scene/resources/skeleton_profile.cpp index a2555900cdb..92b8f817727 100644 --- a/scene/resources/skeleton_profile.cpp +++ b/scene/resources/skeleton_profile.cpp @@ -30,6 +30,8 @@ #include "skeleton_profile.h" +#include "core/config/engine.h" + bool SkeletonProfile::_set(const StringName &p_path, const Variant &p_value) { ERR_FAIL_COND_V(is_read_only, false); String path = p_path; diff --git a/scene/resources/style_box_texture.cpp b/scene/resources/style_box_texture.cpp index c169a790004..97804447aa7 100644 --- a/scene/resources/style_box_texture.cpp +++ b/scene/resources/style_box_texture.cpp @@ -30,6 +30,8 @@ #include "style_box_texture.h" +#include "servers/rendering/rendering_server.h" + float StyleBoxTexture::get_style_margin(Side p_side) const { ERR_FAIL_INDEX_V((int)p_side, 4, 0.0); diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 7713181a4be..97dd1c8a10a 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -31,6 +31,7 @@ #include "texture.h" #include "scene/resources/placeholder_textures.h" +#include "servers/rendering/rendering_server.h" int Texture2D::get_width() const { int ret = 0; diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 33bdf9e4c5e..b8fd0f41000 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -30,12 +30,10 @@ #pragma once +#include "core/io/image.h" #include "core/io/resource.h" -#include "core/math/rect2.h" +#include "core/variant/typed_array.h" #include "scene/resources/curve.h" -#include "scene/resources/gradient.h" -#include "servers/camera/camera_server.h" -#include "servers/rendering/rendering_server.h" class Texture : public Resource { GDCLASS(Texture, Resource); diff --git a/scene/resources/texture_rd.cpp b/scene/resources/texture_rd.cpp index 073ffb3e992..becd6d01f07 100644 --- a/scene/resources/texture_rd.cpp +++ b/scene/resources/texture_rd.cpp @@ -30,6 +30,8 @@ #include "texture_rd.h" +#include "servers/rendering/rendering_server.h" + //////////////////////////////////////////////////////////////////////////// // Texture2DRD diff --git a/servers/display/display_server.h b/servers/display/display_server.h index db86daa803c..920b1c4458b 100644 --- a/servers/display/display_server.h +++ b/servers/display/display_server.h @@ -357,12 +357,12 @@ public: virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0; virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const; virtual float screen_get_max_scale() const { - float scale = 1.f; + float max_scale = 1.f; int screen_count = get_screen_count(); for (int i = 0; i < screen_count; i++) { - scale = std::fmax(scale, screen_get_scale(i)); + max_scale = std::fmax(max_scale, screen_get_scale(i)); } - return scale; + return max_scale; } virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0; virtual Color screen_get_pixel(const Point2i &p_position) const { return Color(); }