Remove DisplayServer includes from remaining files where it's not used

Author: akien-mga

editor/shader/shader_file_editor_plugin.cpp

@@ -38,13 +38,10 @@
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/split_container.h"
-#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_device_binds.h"
 
 /*** SHADER SCRIPT EDITOR ****/
 
-/*** SCRIPT EDITOR ******/
-
 void ShaderFileEditor::_update_version(const StringName &p_version_txt, const RD::ShaderStage p_stage) {
 }
 

platform/android/export/gradle_export_util.h

@@ -37,7 +37,7 @@
 #include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/editor_export_platform.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 const String GODOT_PROJECT_NAME_XML_STRING = R"(<?xml version="1.0" encoding="utf-8"?>
 <!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->

platform/linuxbsd/freedesktop_portal_desktop.cpp

@@ -37,7 +37,9 @@
 #include "core/object/callable_method_pointer.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
+#include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"

platform/linuxbsd/freedesktop_portal_desktop.h

@@ -32,9 +32,10 @@
 
 #ifdef DBUS_ENABLED
 
+#include "core/object/object.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 struct DBusMessage;
 struct DBusConnection;

platform/linuxbsd/wayland/wayland_thread.cpp

@@ -31,6 +31,7 @@
 #include "wayland_thread.h"
 
 #include "core/config/engine.h"
+#include "core/io/image.h"
 
 #ifdef WAYLAND_ENABLED
 

platform/linuxbsd/wayland/wayland_thread.h

@@ -88,11 +88,14 @@
 #endif // LIBDECOR_ENABLED
 
 #include "core/input/input_event.h"
+#include "core/os/os.h"
 #include "core/os/thread.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #include "wayland_embedder.h"
 
+class Image;
+
 class WaylandThread {
 public:
 	// Messages used for exchanging information between Godot's and Wayland's thread.

platform/macos/editor/embedded_game_view_plugin.mm

@@ -35,6 +35,7 @@
 #include "core/input/input.h"
 #include "editor/editor_node.h"
 #include "editor/gui/window_wrapper.h"
+#include "servers/display/display_server.h"
 
 HashMap<String, GameViewDebuggerMacOS::ParseMessageFunc> GameViewDebuggerMacOS::parse_message_handlers;
 

platform/macos/editor/embedded_process_macos.h

@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "editor/run/embedded_process.h"
 #include "scene/gui/control.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 class DisplayServerMacOS;
 class EmbeddedProcessMacOS;

scene/gui/control.compat.inc

@@ -33,7 +33,7 @@
 #include "control.h"
 
 #include "core/object/class_db.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server.h" // IWYU pragma: keep // Needed to bind DisplayServerEnums enums.
 
 bool Control::_has_focus_bind_compat_110250() const {
 	return has_focus(false);

scene/resources/3d/mesh_library.cpp

@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server.h" // IWYU pragma: Needed to bind RSE enums.
+#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
 
 #ifndef PHYSICS_3D_DISABLED
 #include "box_shape_3d.h"