Move server files into their subfolders

modules/openxr/extensions/openxr_hand_tracking_extension.cpp

@@ -34,7 +34,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/print_string.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 #include <openxr/openxr.h>
 

modules/openxr/extensions/openxr_render_model_extension.cpp

@@ -35,7 +35,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/print_string.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 OpenXRRenderModelExtension *OpenXRRenderModelExtension::singleton = nullptr;
 

modules/openxr/extensions/openxr_visibility_mask_extension.cpp

@@ -34,7 +34,7 @@
 #include "core/string/print_string.h"
 #include "core/variant/array.h"
 #include "core/variant/variant.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 
 static const char *VISIBILITY_MASK_SHADER_CODE =
 		"shader_type spatial;\n"

modules/openxr/extensions/platform/openxr_d3d12_extension.cpp

@@ -34,8 +34,8 @@
 
 #include "../../openxr_util.h"
 
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 HashMap<String, bool *> OpenXRD3D12Extension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;

modules/openxr/extensions/platform/openxr_opengl_extension.cpp

@@ -36,8 +36,8 @@
 
 #include "drivers/gles3/effects/copy_effects.h"
 #include "drivers/gles3/storage/texture_storage.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 // OpenXR requires us to submit sRGB textures so that it recognizes the content
 // as being in sRGB color space. We do fall back on "normal" textures but this

modules/openxr/extensions/platform/openxr_vulkan_extension.cpp

@@ -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_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering_server.h"
 
 HashMap<String, bool *> OpenXRVulkanExtension::get_requested_extensions() {
 	HashMap<String, bool *> request_extensions;

modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp

@@ -34,7 +34,7 @@
 #include "../../openxr_util.h"
 #include "../openxr_future_extension.h"
 #include "core/config/project_settings.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationAnchor

modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp

@@ -32,7 +32,7 @@
 
 #include "../../openxr_api.h"
 #include "core/config/project_settings.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialEntityExtension

modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp

@@ -33,7 +33,7 @@
 #include "../../openxr_api.h"
 #include "core/config/project_settings.h"
 #include "openxr_spatial_entity_extension.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationQrCode

modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp

@@ -35,7 +35,7 @@
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationPlaneTracking

modules/openxr/openxr_api.h

@@ -41,7 +41,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/vector.h"
-#include "servers/rendering_server.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_pose.h"
 
 #include <openxr/openxr.h>

modules/openxr/scene/openxr_hand.cpp

@@ -34,7 +34,7 @@
 #include "../openxr_api.h"
 
 #include "scene/3d/skeleton_3d.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void OpenXRHand::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hand", "hand"), &OpenXRHand::set_hand);

modules/openxr/scene/openxr_render_model_manager.cpp

@@ -34,7 +34,7 @@
 #include "../openxr_api.h"
 #include "core/config/project_settings.h"
 #include "scene/3d/xr/xr_nodes.h"
-#include "servers/xr_server.h"
+#include "servers/xr/xr_server.h"
 
 void OpenXRRenderModelManager::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_tracker"), &OpenXRRenderModelManager::get_tracker);