Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Request the XR_KHR_LOADER_INIT_EXTENSION_NAME extension

Browse source
This commit is contained in:
Fredia Huya-Kouadio 2025-04-15 17:30:22 -07:00
parent dbddc9ef29
commit b28e95c8b0
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/openxr/extensions/platform/openxr_android_extension.cpp
View file

@ -58,7 +58,9 @@ OpenXRAndroidExtension::OpenXRAndroidExtension() {
HashMap<String, bool *> OpenXRAndroidExtension::get_requested_extensions() {
HashMap<String, bool *> request_extensions;
request_extensions[XR_KHR_LOADER_INIT_ANDROID_EXTENSION_NAME] = &loader_init_extension_available;
// XR_KHR_LOADER_INIT_EXTENSION_NAME is a dependency of XR_KHR_LOADER_INIT_ANDROID_EXTENSION_NAME
request_extensions[XR_KHR_LOADER_INIT_EXTENSION_NAME] = &loader_init_extension_available;
request_extensions[XR_KHR_LOADER_INIT_ANDROID_EXTENSION_NAME] = &loader_init_android_extension_available;
request_extensions[XR_KHR_ANDROID_CREATE_INSTANCE_EXTENSION_NAME] = &create_instance_extension_available;
return request_extensions;
@ -69,7 +71,7 @@ void OpenXRAndroidExtension::on_before_instance_created() {
// XR_KHR_loader_init not supported on this platform
return;
}
loader_init_extension_available = true;
loader_init_android_extension_available = true;
XrLoaderInitInfoAndroidKHR loader_init_info_android = {
.type = XR_TYPE_LOADER_INIT_INFO_ANDROID_KHR,
@ -87,7 +89,7 @@ static XrInstanceCreateInfoAndroidKHR instance_create_info;
void *OpenXRAndroidExtension::set_instance_create_info_and_get_next_pointer(void *p_next_pointer) {
if (!create_instance_extension_available) {
if (!loader_init_extension_available) {
if (!loader_init_android_extension_available) {
WARN_PRINT("No Android extensions available, couldn't pass JVM and Activity to OpenXR");
}
return nullptr;

1
modules/openxr/extensions/platform/openxr_android_extension.h
View file

@ -53,6 +53,7 @@ private:
JavaVM *vm;
jobject activity_object;
bool loader_init_extension_available = false;
bool loader_init_android_extension_available = false;
bool create_instance_extension_available = false;
// Initialize the loader