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

st/oxr: Write out pose values on failure, better say which layer failed and also check projection layer poses

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-05-28 13:13:31 +01:00
parent 9d791cdfd3
commit 23b882df08
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,2 @@
OpenXR: Give better error messages on invalid poses in quad layers instead of
using the simple macro.

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

@ -0,0 +1,2 @@
OpenXR: Validate poses for project layer views, using the same expressive error
messages as the quad layers.

37
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -489,7 +489,21 @@ verify_quad_layer(struct xrt_compositor *xc,
return ret;
}
OXR_VERIFY_POSE(log, quad->pose);
if (!math_quat_validate((struct xrt_quat *)&quad->pose.orientation)) {
XrQuaternionf *q = &quad->pose.orientation;
return oxr_error(log, XR_ERROR_POSE_INVALID,
"(frameEndInfo->layers[%u]->pose.orientation "
"== {%f %f %f %f}) is not a valid quat",
layer_index, q->x, q->y, q->z, q->w);
}
if (!math_vec3_validate((struct xrt_vec3 *)&quad->pose.position)) {
XrVector3f *p = &quad->pose.position;
return oxr_error(log, XR_ERROR_POSE_INVALID,
"(frameEndInfo->layers[%u]->pose.position "
"== {%f %f %f}) is not valid",
layer_index, p->x, p->y, p->z);
}
if (quad->subImage.imageArrayIndex > 0 &&
sc->swapchain->array_size <= quad->subImage.imageArrayIndex) {
@ -553,6 +567,27 @@ verify_projection_layer(struct xrt_compositor *xc,
// Check for valid swapchain states.
for (uint32_t i = 0; i < proj->viewCount; i++) {
//! @todo More validation?
if (!math_quat_validate(
(struct xrt_quat *)&proj->views[i].pose.orientation)) {
const XrQuaternionf *q =
&proj->views[i].pose.orientation;
return oxr_error(
log, XR_ERROR_POSE_INVALID,
"(frameEndInfo->layers[%u]->views[%i]->pose."
"orientation == {%f %f %f %f}) is not a valid quat",
layer_index, i, q->x, q->y, q->z, q->w);
}
if (!math_vec3_validate(
(struct xrt_vec3 *)&proj->views[i].pose.position)) {
const XrVector3f *p = &proj->views[i].pose.position;
return oxr_error(
log, XR_ERROR_POSE_INVALID,
"(frameEndInfo->layers[%u]->views[%i]->pose."
"position == {%f %f %f}) is not valid",
layer_index, i, p->x, p->y, p->z);
}
struct oxr_swapchain *sc = XRT_CAST_OXR_HANDLE_TO_PTR(
struct oxr_swapchain *, proj->views[i].subImage.swapchain);