The open source OpenXR runtime
st/oxr: Validate that correct XrViewConfigurationType is used in xrLocateViews
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2612>
+7
+7
src/xrt/state_trackers/oxr/oxr_api_session.c
+7
src/xrt/state_trackers/oxr/oxr_api_session.c
···
243
243
OXR_VERIFY_VIEW_CONFIG_TYPE(&log, sess->sys->inst, viewLocateInfo->viewConfigurationType);
244
244
OXR_VERIFY_VIEW_CONFIG_TYPE_SUPPORTED(&log, sess->sys, viewLocateInfo->viewConfigurationType);
245
245
246
+
if (viewLocateInfo->viewConfigurationType != sess->current_view_config_type) {
247
+
return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE,
248
+
"(viewLocateInfo->viewConfigurationType == 0x%" PRIx32
249
+
") is not view configuration passed into xrBeginSession(0x%" PRIx32 ")",
250
+
viewLocateInfo->viewConfigurationType, sess->current_view_config_type);
251
+
}
252
+
246
253
if (viewCapacityInput == 0) {
247
254
OXR_VERIFY_ARG_NOT_NULL(&log, viewCountOutput);
248
255
} else {