|
@@ -51,7 +51,10 @@
|
|
|
#include "core/config/project_settings.h"
|
|
|
#include "core/input/input.h"
|
|
|
#include "main/main.h"
|
|
|
+
|
|
|
+#ifndef _3D_DISABLED
|
|
|
#include "servers/xr_server.h"
|
|
|
+#endif // _3D_DISABLED
|
|
|
|
|
|
#ifdef TOOLS_ENABLED
|
|
|
#include "editor/editor_settings.h"
|
|
@@ -271,14 +274,16 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env,
|
|
|
}
|
|
|
|
|
|
if (step.get() == STEP_SHOW_LOGO) {
|
|
|
- bool xr_enabled;
|
|
|
+ bool xr_enabled = false;
|
|
|
+#ifndef _3D_DISABLED
|
|
|
+ // Unlike PCVR, there's no additional 2D screen onto which to render the boot logo,
|
|
|
+ // so we skip this step if xr is enabled.
|
|
|
if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
|
|
|
xr_enabled = GLOBAL_GET("xr/shaders/enabled");
|
|
|
} else {
|
|
|
xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
|
|
|
}
|
|
|
- // Unlike PCVR, there's no additional 2D screen onto which to render the boot logo,
|
|
|
- // so we skip this step if xr is enabled.
|
|
|
+#endif // _3D_DISABLED
|
|
|
if (!xr_enabled) {
|
|
|
Main::setup_boot_logo();
|
|
|
}
|