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