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

st/oxr: Verify XrViewConfigurationType in xrEnumerateEnvironmentBlendModes

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-05-30 11:58:06 +01:00
parent fb867b02c3
commit 12d78144f6
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/changes/state_trackers/mr.359.1.md Normal file
View file

@ -0,0 +1,2 @@
OpenXR: Verify that the XrViewConfigurationType is supported by the system as
required by the OpenXR spec in xrEnumerateEnvironmentBlendModes.

31
src/xrt/state_trackers/oxr/oxr_api_system.c
View file

@ -101,6 +101,23 @@ oxr_xrEnumerateViewConfigurations(
viewConfigurationTypeCountOutput, viewConfigurationTypes);
}
static XrResult
check_view_config_type(struct oxr_logger *log,
struct oxr_instance *inst,
XrViewConfigurationType view_conf)
{
// These are always valid.
if (view_conf == XR_VIEW_CONFIGURATION_TYPE_PRIMARY_MONO ||
view_conf == XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO) {
return XR_SUCCESS;
}
return oxr_error(
log, XR_ERROR_VALIDATION_FAILURE,
"(viewConfigurationType == 0x%08x) invalid view configuration type",
view_conf);
}
XrResult
oxr_xrEnumerateEnvironmentBlendModes(
XrInstance instance,
@ -112,10 +129,24 @@ oxr_xrEnumerateEnvironmentBlendModes(
{
struct oxr_instance *inst;
struct oxr_logger log;
XrResult ret;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrEnumerateEnvironmentBlendModes");
OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys);
ret = check_view_config_type(&log, inst, viewConfigurationType);
if (ret != XR_SUCCESS) {
return ret;
}
if (viewConfigurationType != sys->view_config_type) {
return oxr_error(&log,
XR_ERROR_VIEW_CONFIGURATION_TYPE_UNSUPPORTED,
"(viewConfigurationType == 0x%08x) "
"unsupported view configuration type",
viewConfigurationType);
}
return oxr_system_enumerate_blend_modes(
&log, sys, viewConfigurationType, environmentBlendModeCapacityInput,
environmentBlendModeCountOutput, environmentBlendModes);