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: Tidy code

Browse source 
The CHECK_LAYER_TYPE tests would falsely pass on the
IPC layer as it always implements all of the functions.
This commit is contained in:
Jakob Bornecrantz 2021-01-22 13:51:08 +00:00
parent f326ec8fc3
commit cb51b32ff1
4 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,9 +100,9 @@ oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *out_ins
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo, XR_TYPE_INSTANCE_CREATE_INFO); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo, XR_TYPE_INSTANCE_CREATE_INFO);
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);
#if 0
const uint32_t patch = XR_VERSION_PATCH(XR_CURRENT_API_VERSION); const uint32_t patch = XR_VERSION_PATCH(XR_CURRENT_API_VERSION);
#endif (void)patch; // Not used for now.
if (createInfo->applicationInfo.apiVersion < XR_MAKE_VERSION(major, minor, 0)) { if (createInfo->applicationInfo.apiVersion < XR_MAKE_VERSION(major, minor, 0)) {
return oxr_error(&log, XR_ERROR_API_VERSION_UNSUPPORTED, return oxr_error(&log, XR_ERROR_API_VERSION_UNSUPPORTED,

1
src/xrt/state_trackers/oxr/oxr_input.c
View file

@ -1065,6 +1065,7 @@ oxr_action_cache_update(struct oxr_logger *log,
break; break;
} }
#if 0 #if 0
// Untested, we have no VEC3 input.
case XRT_INPUT_TYPE_VEC3_MINUS_ONE_TO_ONE: { case XRT_INPUT_TYPE_VEC3_MINUS_ONE_TO_ONE: {
changed = (combined.value.vec3.x != last.vec3.x) || changed = (combined.value.vec3.x != last.vec3.x) ||
(combined.value.vec3.y != last.vec3.y) || (combined.value.vec3.y != last.vec3.y) ||

36
src/xrt/state_trackers/oxr/oxr_instance.c
View file

@ -311,42 +311,6 @@ oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createIn
oxr_instance_destroy(log, &inst->handle); oxr_instance_destroy(log, &inst->handle);
return ret; return ret;
} }
#if 0
// Make sure that the compositor we were given can do all the
// things the build config promised.
#define CHECK_LAYER_TYPE(NAME, MEMBER_NAME) \
do { \
if (sys->xcn->base.MEMBER_NAME == NULL) { \
ret = oxr_error(log, XR_ERROR_INITIALIZATION_FAILED, \
"Logic error: build config " \
"advertised support for " NAME \
" but compositor does not " \
"implement " #MEMBER_NAME); \
oxr_instance_destroy(log, &inst->handle); \
assert(false && "Build configured with unsupported layers"); \
return ret; \
} \
} while (0)
// Keep this list in sync with types in xrt_config_build.h
#ifdef XRT_FEATURE_OPENXR_LAYER_CUBE
CHECK_LAYER_TYPE("cube layers", layer_cube);
#endif
#ifdef XRT_FEATURE_OPENXR_LAYER_CYLINDER
CHECK_LAYER_TYPE("cylinder layers", layer_cylinder);
#endif
#ifdef XRT_FEATURE_OPENXR_LAYER_DEPTH
CHECK_LAYER_TYPE("projection layers with depth images", layer_stereo_projection_depth);
#endif
#ifdef XRT_FEATURE_OPENXR_LAYER_EQUIRECT1
CHECK_LAYER_TYPE("equirect1 layers", layer_equirect1);
#endif
#ifdef XRT_FEATURE_OPENXR_LAYER_EQUIRECT2
CHECK_LAYER_TYPE("equirect2 layers", layer_equirect2);
#endif
#undef CHECK_LAYER_TYPE
#endif
} }
ret = oxr_system_fill_in(log, inst, 1, &inst->system); ret = oxr_system_fill_in(log, inst, 1, &inst->system);

12
src/xrt/state_trackers/oxr/oxr_space.c
View file

@ -30,12 +30,14 @@ check_reference_space_type(struct oxr_logger *log, XrReferenceSpaceType type)
switch (type) { switch (type) {
case XR_REFERENCE_SPACE_TYPE_VIEW: return XR_SUCCESS; case XR_REFERENCE_SPACE_TYPE_VIEW: return XR_SUCCESS;
case XR_REFERENCE_SPACE_TYPE_LOCAL: return XR_SUCCESS; case XR_REFERENCE_SPACE_TYPE_LOCAL: return XR_SUCCESS;
case XR_REFERENCE_SPACE_TYPE_STAGE: return XR_SUCCESS; case XR_REFERENCE_SPACE_TYPE_STAGE:
#if 0 // For now stage space is always supported.
if (true) {
return XR_SUCCESS;
}
return oxr_error(log, XR_ERROR_REFERENCE_SPACE_UNSUPPORTED, return oxr_error(log, XR_ERROR_REFERENCE_SPACE_UNSUPPORTED,
"(createInfo->referenceSpaceType = " "(createInfo->referenceSpaceType == XR_REFERENCE_SPACE_TYPE_STAGE)"
"XR_REFERENCE_SPACE_TYPE_STAGE)"); " Stage space is unsupported on this device.");
#endif
default: default:
return oxr_error(log, XR_ERROR_REFERENCE_SPACE_UNSUPPORTED, return oxr_error(log, XR_ERROR_REFERENCE_SPACE_UNSUPPORTED,
"(createInfo->referenceSpaceType == 0x%08x)", type); "(createInfo->referenceSpaceType == 0x%08x)", type);