mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Fix API negotiation code

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-07-15 19:34:24 +01:00
parent 3a89e2f0d4
commit 08a4b40f77
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/xrt/state_trackers/oxr/oxr_api_instance.c
View file

@ -66,26 +66,29 @@ oxr_xrCreateInstance(const XrInstanceCreateInfo* createInfo,
oxr_log_init(&log, "xrCreateInstance"); oxr_log_init(&log, "xrCreateInstance");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo,
XR_TYPE_INSTANCE_CREATE_INFO); XR_TYPE_INSTANCE_CREATE_INFO);
#if XR_VERSION_MAJOR != 0
#error "Must update this code following 1.0 release!"
#endif
const uint32_t major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION); const uint32_t major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION);
const uint32_t minor = XR_VERSION_MINOR(XR_CURRENT_API_VERSION); const uint32_t minor = XR_VERSION_MINOR(XR_CURRENT_API_VERSION);
/* const uint32_t patch = XR_VERSION_PATCH(XR_CURRENT_API_VERSION);*/ #if 0
const uint32_t patch = XR_VERSION_PATCH(XR_CURRENT_API_VERSION);
#endif
if (createInfo->applicationInfo.apiVersion < if (createInfo->applicationInfo.apiVersion <
XR_MAKE_VERSION(major, minor, 0)) { XR_MAKE_VERSION(major, minor, 0)) {
return oxr_error( return oxr_error(
&log, XR_ERROR_RUNTIME_VERSION_INCOMPATIBLE, &log, XR_ERROR_API_VERSION_UNSUPPORTED,
"(createInfo->applicationInfo.apiVersion) " "(createInfo->applicationInfo.apiVersion) "
"Cannot satisfy request for version less than %d.%d.%d", "Cannot satisfy request for version less than %d.%d.%d",
major, minor, 0); major, minor, 0);
} }
/* This is a slight fib, to let us approximately run pre-release
* things between 0.90 and 1.0 */ /*
* This is a slight fib, to let us approximately run things between 1.0
* and 2.0
*/
if (createInfo->applicationInfo.apiVersion >= if (createInfo->applicationInfo.apiVersion >=
XR_MAKE_VERSION(1, 0, 0)) { XR_MAKE_VERSION(2, 0, 0)) {
return oxr_error( return oxr_error(
&log, XR_ERROR_RUNTIME_VERSION_INCOMPATIBLE, &log, XR_ERROR_API_VERSION_UNSUPPORTED,
"(createInfo->applicationInfo.apiVersion) " "(createInfo->applicationInfo.apiVersion) "
"Cannot satisfy request for version: too high"); "Cannot satisfy request for version: too high");
} }

22
src/xrt/state_trackers/oxr/oxr_api_negotiate.c
View file

@ -59,33 +59,23 @@ xrNegotiateLoaderRuntimeInterface(const XrNegotiateLoaderInfo* loaderInfo,
// TODO: properly define what we support // TODO: properly define what we support
uint16_t supported_major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION); uint16_t supported_major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION);
uint16_t supported_minor = XR_VERSION_MINOR(XR_CURRENT_API_VERSION);
uint16_t requested_min_major = uint32_t requested_min_major = loaderInfo->minInterfaceVersion;
XR_VERSION_MAJOR(loaderInfo->minInterfaceVersion); uint32_t requested_max_major = loaderInfo->maxInterfaceVersion;
uint16_t requested_min_minor =
XR_VERSION_MINOR(loaderInfo->minInterfaceVersion);
uint16_t requested_max_major =
XR_VERSION_MAJOR(loaderInfo->maxInterfaceVersion);
uint16_t requested_max_minor =
XR_VERSION_MINOR(loaderInfo->maxInterfaceVersion);
if (supported_major > requested_max_major || if (supported_major > requested_max_major ||
supported_major < requested_min_major) { supported_major < requested_min_major) {
PRINT_NEGOTIATE( PRINT_NEGOTIATE(
"\tXRT - OpenXR doesn't support requested version %d.%d <= " "\tXRT - OpenXR doesn't support requested version %d <= "
"%d.%d <= %d.%d", "%d <= %d\n",
requested_min_major, requested_min_minor, supported_major, requested_min_major, supported_major, requested_max_major);
supported_minor, requested_max_major, requested_max_minor);
return XR_ERROR_INITIALIZATION_FAILED; return XR_ERROR_INITIALIZATION_FAILED;
} }
runtimeRequest->getInstanceProcAddr = oxr_xrGetInstanceProcAddr; runtimeRequest->getInstanceProcAddr = oxr_xrGetInstanceProcAddr;
runtimeRequest->runtimeInterfaceVersion = runtimeRequest->runtimeInterfaceVersion =
XR_CURRENT_LOADER_RUNTIME_VERSION; XR_CURRENT_LOADER_RUNTIME_VERSION;
runtimeRequest->runtimeXrVersion = runtimeRequest->runtimeApiVersion = XR_CURRENT_API_VERSION;
XR_MAKE_VERSION(0, XR_HEADER_VERSION, 0);
PRINT_NEGOTIATE("\tall ok!\n"); PRINT_NEGOTIATE("\tall ok!\n");