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: Fix projection layer viewCount validation

Browse source
This commit is contained in:
Christoph Haag 2024-03-29 19:27:20 +01:00 committed by Simon Zeni
parent 1059c5fa4f
commit 3fd69da828
1 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/xrt/state_trackers/oxr/oxr_session_frame_end.c
View file

@ -591,11 +591,44 @@ verify_projection_layer(struct oxr_session *sess,
return ret;
}
if (proj->viewCount < 1 || proj->viewCount > XRT_MAX_VIEWS) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"(frameEndInfo->layers[%u]->viewCount == %u) must be between 1 and %d for projection "
"layers and the current view configuration",
layer_index, proj->viewCount, XRT_MAX_VIEWS);
switch (sess->sys->view_config_type) {
case XR_VIEW_CONFIGURATION_TYPE_PRIMARY_MONO:
if (proj->viewCount != 1) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"(frameEndInfo->layers[%u]->viewCount == %u) must be 1 for "
"XR_VIEW_CONFIGURATION_TYPE_PRIMARY_MONO",
layer_index, proj->viewCount);
}
break;
case XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO:
if (proj->viewCount != 2) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"(frameEndInfo->layers[%u]->viewCount == %u) must be 2 for "
"XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO",
layer_index, proj->viewCount);
}
break;
case XR_VIEW_CONFIGURATION_TYPE_PRIMARY_QUAD_VARJO:
if (proj->viewCount != 4) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"(frameEndInfo->layers[%u]->viewCount == %u) must be 4 for "
"XR_VIEW_CONFIGURATION_TYPE_PRIMARY_QUAD_VARJO",
layer_index, proj->viewCount);
}
break;
case XR_VIEW_CONFIGURATION_TYPE_SECONDARY_MONO_FIRST_PERSON_OBSERVER_MSFT:
if (proj->viewCount != 1) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"(frameEndInfo->layers[%u]->viewCount == %u) must be 1 for "
"XR_VIEW_CONFIGURATION_TYPE_SECONDARY_MONO_FIRST_PERSON_OBSERVER_MSFT",
layer_index, proj->viewCount);
}
break;
default:
assert(false && "view type validation unimplemented");
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "view type %d not supported",
sess->sys->view_config_type);
break;
}
// number of depth layers must be 0 or proj->viewCount