godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #103267 from YeldhamDev/reality_got_too_extended

Browse Source 
Allow to compile the engine without XR support
This commit is contained in:
Thaddeus Crews
2025-03-07 15:12:54 -06:00
parent a5dbf3bd49 aea559b39a
commit 67d4a245d8
33 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/main.cpp
View File

@@ -713,9 +713,9 @@ Error Main::test_setup() {
/** INITIALIZE SERVERS **/
register_server_types();
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
#endif // _3D_DISABLED
#endif // XR_DISABLED
initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
GDExtensionManager::get_singleton()->initialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
@@ -1734,7 +1734,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->disable_crash_handler();
} else if (arg == "--skip-breakpoints") {
skip_breakpoints = true;
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
} else if (arg == "--xr-mode") {
if (N) {
String xr_mode = N->get().to_lower();
@@ -1753,7 +1753,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->print("Missing --xr-mode argument, aborting.\n");
goto error;
}
#endif // _3D_DISABLED
#endif // XR_DISABLED
} else if (arg == "--benchmark") {
OS::get_singleton()->set_use_benchmark(true);
} else if (arg == "--benchmark-file") {
@@ -3196,7 +3196,7 @@ Error Main::setup2(bool p_show_boot_logo) {
OS::get_singleton()->benchmark_end_measure("Servers", "Audio");
}
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
/* Initialize XR Server */
{
@@ -3206,7 +3206,7 @@ Error Main::setup2(bool p_show_boot_logo) {
OS::get_singleton()->benchmark_end_measure("Servers", "XR");
}
#endif // _3D_DISABLED
#endif // XR_DISABLED
OS::get_singleton()->benchmark_end_measure("Startup", "Servers");
@@ -4429,9 +4429,9 @@ bool Main::iteration() {
bool exit = false;
// process all our active interfaces
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
XRServer::get_singleton()->_process();
#endif // _3D_DISABLED
#endif // XR_DISABLED
NavigationServer2D::get_singleton()->sync();
NavigationServer3D::get_singleton()->sync();
@@ -4685,13 +4685,13 @@ void Main::cleanup(bool p_force) {
//clear global shader variables before scene and other graphics stuff are deinitialized.
rendering_server->global_shader_parameters_clear();
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
if (xr_server) {
// Now that we're unregistering properly in plugins we need to keep access to xr_server for a little longer
// We do however unset our primary interface
xr_server->set_primary_interface(Ref<XRInterface>());
}
#endif // _3D_DISABLED
#endif // XR_DISABLED
#ifdef TOOLS_ENABLED
GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_EDITOR);