mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-03 21:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Validate some internal state and improve error message

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-05-26 18:22:09 +01:00
parent 41e3a6fd17
commit 4039dc7096
1 changed files with 31 additions and 14 deletions

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

@ -388,18 +388,33 @@ oxr_session_frame_wait(struct oxr_logger *log,
time_state_get_now_and_update(sess->sys->inst->timekeeping);
struct xrt_compositor *xc = sess->compositor;
if (xc != NULL) {
uint64_t predicted_display_time;
uint64_t predicted_display_period;
xrt_comp_wait_frame(xc, &predicted_display_time,
&predicted_display_period);
frameState->shouldRender = should_render(sess->state);
frameState->predictedDisplayPeriod = predicted_display_period;
frameState->predictedDisplayTime = time_state_from_monotonic_ns(
sess->sys->inst->timekeeping, predicted_display_time);
} else {
if (xc == NULL) {
frameState->shouldRender = XR_FALSE;
return oxr_session_success_result(sess);
}
uint64_t predicted_display_time;
uint64_t predicted_display_period;
xrt_comp_wait_frame(xc, &predicted_display_time,
&predicted_display_period);
if ((int64_t)predicted_display_time < 0) {
//! @todo Also check for zero.
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
" got a negative display time '%" PRIi64 "'",
(int64_t)predicted_display_time);
}
frameState->shouldRender = should_render(sess->state);
frameState->predictedDisplayPeriod = predicted_display_period;
frameState->predictedDisplayTime = time_state_from_monotonic_ns(
sess->sys->inst->timekeeping, predicted_display_time);
if (frameState->predictedDisplayTime <= 0) {
return oxr_error(
log, XR_ERROR_RUNTIME_FAILURE,
" time_state_from_monotonic_ns returned '%" PRIi64 "'",
frameState->predictedDisplayTime);
}
return oxr_session_success_result(sess);
@ -641,9 +656,11 @@ oxr_session_frame_end(struct oxr_logger *log,
}
if (frameEndInfo->displayTime <= 0) {
return oxr_error(log, XR_ERROR_TIME_INVALID,
"(frameEndInfo->displayTime) zero or a "
"negative value is not a valid XrTime");
return oxr_error(
log, XR_ERROR_TIME_INVALID,
"(frameEndInfo->displayTime == %" PRIi64
") zero or a negative value is not a valid XrTime",
frameEndInfo->displayTime);
}
struct xrt_compositor *xc = sess->compositor;