From b51acac638503c2b114403bbbf4e5ff63ef90dea Mon Sep 17 00:00:00 2001 From: rsjtdrjgfuzkfg Date: Sat, 7 Jan 2023 18:41:58 +0100 Subject: OpenXR: Fix initialization warning on Android This commit adds proper checking for XR_KHR_loader_init support and fixes the warning regarding missing extensions on Android to only appear if neither XR_KHR_loader_init nor XR_KHR_loader_init_android are supported by the runtime. --- modules/openxr/util.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/openxr/util.h') diff --git a/modules/openxr/util.h b/modules/openxr/util.h index f3fa187faa..6665d45007 100644 --- a/modules/openxr/util.h +++ b/modules/openxr/util.h @@ -53,6 +53,12 @@ #define EXT_INIT_XR_FUNC(name) INIT_XR_FUNC(OpenXRAPI::get_singleton(), name) #define OPENXR_API_INIT_XR_FUNC(name) INIT_XR_FUNC(this, name) +#define TRY_INIT_XR_FUNC(openxr_api, name) \ + openxr_api->try_get_instance_proc_addr(#name, (PFN_xrVoidFunction *)&name##_ptr) + +#define EXT_TRY_INIT_XR_FUNC(name) TRY_INIT_XR_FUNC(OpenXRAPI::get_singleton(), name) +#define OPENXR_TRY_API_INIT_XR_FUNC(name) TRY_INIT_XR_FUNC(this, name) + #define EXT_PROTO_XRRESULT_FUNC1(func_name, arg1_type, arg1) \ PFN_##func_name func_name##_ptr = nullptr; \ XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1) const { \ -- cgit v1.2.3