godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Android builds when OpenXR is disabled

Browse Source
This commit is contained in:
Fredia Huya-Kouadio 2024-08-30 23:11:50 -07:00
parent 61598c5c88
commit 92ffa93c58
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/android/java_godot_lib_jni.cpp
View File

@ -51,7 +51,10 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/input/input.h" #include "core/input/input.h"
#include "main/main.h" #include "main/main.h"
#ifndef _3D_DISABLED
#include "servers/xr_server.h" #include "servers/xr_server.h"
#endif // _3D_DISABLED
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/editor_settings.h" #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) { 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) { if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
xr_enabled = GLOBAL_GET("xr/shaders/enabled"); xr_enabled = GLOBAL_GET("xr/shaders/enabled");
} else { } else {
xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON; xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
} }
// Unlike PCVR, there's no additional 2D screen onto which to render the boot logo, #endif // _3D_DISABLED
// so we skip this step if xr is enabled.
if (!xr_enabled) { if (!xr_enabled) {
Main::setup_boot_logo(); Main::setup_boot_logo();
} }