mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-10-20 12:30:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Fix conformance issue in xrBeginFrame

Browse source
This commit is contained in:
Ryan Pavlik 2019-04-04 18:19:15 -05:00
parent 3d2d391fbe
commit af2756b50a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/xrt/state_trackers/oxr/oxr_api_session.c
View file

@ -94,8 +94,8 @@ oxr_xrWaitFrame(XrSession session,
struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame");
if (sess->compositor == NULL) {
return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE,
"xrWaitFrame is illegal headless sessions");
return oxr_error(&log, XR_ERROR_GRAPHICS_DEVICE_INVALID,
"xrWaitFrame is illegal in headless sessions");
}
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameState, XR_TYPE_FRAME_STATE);
OXR_VERIFY_ARG_NOT_NULL(&log, frameState);
@ -109,8 +109,11 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo* frameBeginInfo)
struct oxr_session* sess;
struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO);
// NULL explicitly allowed here because it's a basically empty struct.
if (frameBeginInfo != NULL) {
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO);
}
return oxr_session_frame_begin(&log, sess);
}