mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-15 02:00:22 +00:00
st/oxr: Fix typo in OXR_CHECK_XRET define usages [NFC]
Fix typo that I introduced in !1727 (95512594a0
).
This commit is contained in:
parent
24de185b6c
commit
a2081db38a
src/xrt/state_trackers/oxr
|
@ -142,7 +142,7 @@ oxr_session_begin(struct oxr_logger *log, struct oxr_session *sess, const XrSess
|
|||
|
||||
enum xrt_view_type xvt = (enum xrt_view_type)beginInfo->primaryViewConfigurationType;
|
||||
xrt_result_t xret = xrt_comp_begin_session(xc, xvt);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_begin_session");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_begin_session);
|
||||
}
|
||||
|
||||
sess->has_begun = true;
|
||||
|
@ -175,7 +175,7 @@ oxr_session_end(struct oxr_logger *log, struct oxr_session *sess)
|
|||
sess->frame_started = false;
|
||||
|
||||
xrt_result_t xret = xrt_comp_end_session(xc);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_end_session");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_end_session);
|
||||
}
|
||||
|
||||
oxr_session_change_state(log, sess, XR_SESSION_STATE_IDLE, 0);
|
||||
|
@ -498,7 +498,7 @@ oxr_session_frame_wait(struct oxr_logger *log, struct oxr_session *sess, XrFrame
|
|||
&sess->frame_id.waited, // out_frame_id
|
||||
&predicted_display_time, // out_predicted_display_time
|
||||
&predicted_display_period); // out_predicted_display_period
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_wait_frame");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_wait_frame);
|
||||
|
||||
if ((int64_t)predicted_display_time <= 0) {
|
||||
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Got a negative display time '%" PRIi64 "'",
|
||||
|
@ -556,7 +556,7 @@ oxr_session_frame_begin(struct oxr_logger *log, struct oxr_session *sess)
|
|||
ret = XR_FRAME_DISCARDED;
|
||||
if (xc != NULL) {
|
||||
xrt_result_t xret = xrt_comp_discard_frame(xc, sess->frame_id.begun);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_discard_frame");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_discard_frame);
|
||||
sess->frame_id.begun = -1;
|
||||
|
||||
os_mutex_lock(&sess->active_wait_frames_lock);
|
||||
|
@ -569,7 +569,7 @@ oxr_session_frame_begin(struct oxr_logger *log, struct oxr_session *sess)
|
|||
}
|
||||
if (xc != NULL) {
|
||||
xrt_result_t xret = xrt_comp_begin_frame(xc, sess->frame_id.waited);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_begin_frame");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_begin_frame);
|
||||
sess->frame_id.begun = sess->frame_id.waited;
|
||||
sess->frame_id.waited = -1;
|
||||
}
|
||||
|
|
|
@ -933,7 +933,7 @@ submit_quad_layer(struct oxr_session *sess,
|
|||
fill_in_sub_image(sc, &quad->subImage, &data.quad.sub);
|
||||
|
||||
xrt_result_t xret = xrt_comp_layer_quad(xc, head, sc->swapchain, &data);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_quad");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_quad);
|
||||
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
@ -1032,7 +1032,7 @@ submit_projection_layer(struct oxr_session *sess,
|
|||
d_scs[0]->swapchain, // left
|
||||
d_scs[1]->swapchain, // right
|
||||
&data); // data
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_stereo_projection_depth");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_stereo_projection_depth);
|
||||
#else
|
||||
assert(false && "Should not get here");
|
||||
#endif // XRT_FEATURE_OPENXR_LAYER_DEPTH
|
||||
|
@ -1043,7 +1043,7 @@ submit_projection_layer(struct oxr_session *sess,
|
|||
scs[0]->swapchain, // left
|
||||
scs[1]->swapchain, // right
|
||||
&data); // data
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_stereo_projection");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_stereo_projection);
|
||||
}
|
||||
|
||||
return XR_SUCCESS;
|
||||
|
@ -1094,7 +1094,7 @@ submit_cube_layer(struct oxr_session *sess,
|
|||
}
|
||||
|
||||
xrt_result_t xret = xrt_comp_layer_cube(xc, head, sc->swapchain, &data);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_cube");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_cube);
|
||||
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
@ -1141,7 +1141,7 @@ submit_cylinder_layer(struct oxr_session *sess,
|
|||
fill_in_sub_image(sc, &cylinder->subImage, &data.cylinder.sub);
|
||||
|
||||
xrt_result_t xret = xrt_comp_layer_cylinder(xc, head, sc->swapchain, &data);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_cylinder");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_cylinder);
|
||||
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
@ -1191,7 +1191,7 @@ submit_equirect1_layer(struct oxr_session *sess,
|
|||
data.equirect1.bias = *bias;
|
||||
|
||||
xrt_result_t xret = xrt_comp_layer_equirect1(xc, head, sc->swapchain, &data);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_equirect1");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_equirect1);
|
||||
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
@ -1246,7 +1246,7 @@ submit_equirect2_layer(struct oxr_session *sess,
|
|||
fill_in_sub_image(sc, &equirect->subImage, &data.equirect2.sub);
|
||||
|
||||
xrt_result_t xret = xrt_comp_layer_equirect2(xc, head, sc->swapchain, &data);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_equirect2");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_equirect2);
|
||||
|
||||
return XR_SUCCESS;
|
||||
}
|
||||
|
@ -1328,7 +1328,7 @@ oxr_session_frame_end(struct oxr_logger *log, struct oxr_session *sess, const Xr
|
|||
os_mutex_unlock(&sess->active_wait_frames_lock);
|
||||
|
||||
xrt_result_t xret = xrt_comp_discard_frame(xc, sess->frame_id.begun);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_discard_frame");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_discard_frame);
|
||||
sess->frame_id.begun = -1;
|
||||
sess->frame_started = false;
|
||||
|
||||
|
@ -1404,7 +1404,7 @@ oxr_session_frame_end(struct oxr_logger *log, struct oxr_session *sess, const Xr
|
|||
|
||||
xrt_result_t xret;
|
||||
xret = xrt_comp_layer_begin(xc, sess->frame_id.begun, xrt_display_time_ns, blend_mode);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_begin");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_begin);
|
||||
|
||||
for (uint32_t i = 0; i < frameEndInfo->layerCount; i++) {
|
||||
const XrCompositionLayerBaseHeader *layer = frameEndInfo->layers[i];
|
||||
|
@ -1440,7 +1440,7 @@ oxr_session_frame_end(struct oxr_logger *log, struct oxr_session *sess, const Xr
|
|||
}
|
||||
|
||||
xret = xrt_comp_layer_commit(xc, sess->frame_id.begun, XRT_GRAPHICS_SYNC_HANDLE_INVALID);
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_layer_commit");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_commit);
|
||||
|
||||
sess->frame_id.begun = -1;
|
||||
sess->frame_started = false;
|
||||
|
|
|
@ -36,7 +36,7 @@ oxr_swapchain_acquire_image(struct oxr_logger *log,
|
|||
struct xrt_swapchain *xsc = (struct xrt_swapchain *)sc->swapchain;
|
||||
|
||||
xrt_result_t xret = xrt_swapchain_acquire_image(xsc, &index);
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, "xrt_swapchain_acquire_image");
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, xrt_swapchain_acquire_image);
|
||||
|
||||
if (sc->images[index].state != OXR_IMAGE_STATE_READY) {
|
||||
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
|
||||
|
@ -76,7 +76,7 @@ oxr_swapchain_wait_image(struct oxr_logger *log, struct oxr_swapchain *sc, const
|
|||
struct xrt_swapchain *xsc = (struct xrt_swapchain *)sc->swapchain;
|
||||
|
||||
xrt_result_t xret = xrt_swapchain_wait_image(xsc, waitInfo->timeout, index);
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, "xrt_swapchain_wait_image");
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, xrt_swapchain_wait_image);
|
||||
|
||||
// The app can only wait on one image.
|
||||
sc->waited.yes = true;
|
||||
|
@ -100,7 +100,7 @@ oxr_swapchain_release_image(struct oxr_logger *log,
|
|||
|
||||
struct xrt_swapchain *xsc = (struct xrt_swapchain *)sc->swapchain;
|
||||
xrt_result_t xret = xrt_swapchain_release_image(xsc, index);
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, "xrt_swapchain_release_image");
|
||||
OXR_CHECK_XRET(log, sc->sess, xret, xrt_swapchain_release_image);
|
||||
|
||||
// Only decerement here.
|
||||
sc->acquired.num--;
|
||||
|
@ -202,7 +202,7 @@ oxr_create_swapchain(struct oxr_logger *log,
|
|||
return oxr_error(log, XR_ERROR_SWAPCHAIN_FORMAT_UNSUPPORTED,
|
||||
"Specified swapchain format is not supported");
|
||||
}
|
||||
OXR_CHECK_XRET(log, sess, xret, "xrt_comp_create_swapchain");
|
||||
OXR_CHECK_XRET(log, sess, xret, xrt_comp_create_swapchain);
|
||||
assert(xsc != NULL);
|
||||
|
||||
struct oxr_swapchain *sc = NULL;
|
||||
|
|
Loading…
Reference in a new issue