+6

src/xrt/state_trackers/oxr/oxr_api_funcs.h

··· 50 50 * 51 51 */ 52 52 53 53 + #ifdef OXR_HAVE_KHR_loader_init 54 54 + //! OpenXR API function @ep{xrInitializeLoaderKHR} 55 55 + XRAPI_ATTR XrResult XRAPI_CALL 56 56 + oxr_xrInitializeLoaderKHR(const XrLoaderInitInfoBaseHeaderKHR *loaderInitInfo); 57 57 + #endif // OXR_HAVE_KHR_loader_init 58 58 + 53 59 //! OpenXR API function @ep{xrEnumerateInstanceExtensionProperties} 54 60 XRAPI_ATTR XrResult XRAPI_CALL 55 61 oxr_xrEnumerateInstanceExtensionProperties(const char *layerName,

+41

src/xrt/state_trackers/oxr/oxr_api_instance.c

··· 21 21 #include "oxr_api_funcs.h" 22 22 #include "oxr_api_verify.h" 23 23 24 24 + 25 25 + #ifdef XRT_OS_ANDROID 26 26 + #include "android/android_globals.h" 27 27 + #endif 28 28 + 24 29 #include "openxr/openxr.h" 25 30 #include "openxr/openxr_reflection.h" 26 31 ··· 48 53 OXR_TWO_CALL_HELPER(&log, propertyCapacityInput, propertyCountOutput, properties, 49 54 ARRAY_SIZE(extension_properties), extension_properties, XR_SUCCESS); 50 55 } 56 56 + 57 57 + #ifdef OXR_HAVE_KHR_loader_init 58 58 + XrResult 59 59 + oxr_xrInitializeLoaderKHR(const XrLoaderInitInfoBaseHeaderKHR *loaderInitInfo) 60 60 + { 61 61 + struct oxr_logger log; 62 62 + oxr_log_init(&log, "oxr_xrInitializeLoaderKHR"); 63 63 + 64 64 + 65 65 + oxr_log(&log, "Loader forwarded call to xrInitializeLoaderKHR."); 66 66 + #ifdef XRT_OS_ANDROID 67 67 + const XrLoaderInitInfoAndroidKHR *initInfoAndroid = 68 68 + OXR_GET_INPUT_FROM_CHAIN(loaderInitInfo, XR_TYPE_LOADER_INIT_INFO_ANDROID_KHR, XrLoaderInitInfoAndroidKHR); 69 69 + if (initInfoAndroid == NULL) { 70 70 + return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE, 71 71 + "(loaderInitInfo) " 72 72 + "Did not find XrLoaderInitInfoAndroidKHR"); 73 73 + } 74 74 + if (initInfoAndroid->applicationVM == NULL) { 75 75 + return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE, 76 76 + "(initInfoAndroid->applicationVM) " 77 77 + "applicationVM must be populated"); 78 78 + } 79 79 + if (initInfoAndroid->applicationContext == NULL) { 80 80 + return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE, 81 81 + "(initInfoAndroid->applicationContext) " 82 82 + "applicationContext must be populated"); 83 83 + } 84 84 + //! @todo check that applicationContext is in fact an Activity. 85 85 + android_globals_store_vm_and_context(initInfoAndroid->applicationVM, initInfoAndroid->applicationContext); 86 86 + 87 87 + #endif // XRT_OS_ANDROID 88 88 + return XR_SUCCESS; 89 89 + } 90 90 + #endif // OXR_HAVE_KHR_loader_init 91 91 + 51 92 52 93 #ifdef XRT_OS_ANDROID 53 94 static XrResult

+4

src/xrt/state_trackers/oxr/oxr_api_negotiate.c

··· 276 276 ENTRY(xrEnumerateInstanceExtensionProperties); 277 277 ENTRY(xrEnumerateApiLayerProperties); 278 278 279 279 + #ifdef OXR_HAVE_KHR_loader_init 280 280 + ENTRY(xrInitializeLoaderKHR); 281 281 + #endif // OXR_HAVE_KHR_loader_init 282 282 + 279 283 /* 280 284 * This is fine to log, since there should not be other 281 285 * null-instance calls.