Skip to content
Snippets Groups Projects
Commit af2756b5 authored by Ryan Pavlik's avatar Ryan Pavlik
Browse files

st/oxr: Fix conformance issue in xrBeginFrame

parent 3d2d391f
No related branches found
Tags
No related merge requests found
...@@ -94,8 +94,8 @@ oxr_xrWaitFrame(XrSession session, ...@@ -94,8 +94,8 @@ oxr_xrWaitFrame(XrSession session,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame");
if (sess->compositor == NULL) { if (sess->compositor == NULL) {
return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE, return oxr_error(&log, XR_ERROR_GRAPHICS_DEVICE_INVALID,
"xrWaitFrame is illegal headless sessions"); "xrWaitFrame is illegal in headless sessions");
} }
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameState, XR_TYPE_FRAME_STATE); OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameState, XR_TYPE_FRAME_STATE);
OXR_VERIFY_ARG_NOT_NULL(&log, frameState); OXR_VERIFY_ARG_NOT_NULL(&log, frameState);
...@@ -109,8 +109,11 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo* frameBeginInfo) ...@@ -109,8 +109,11 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo* frameBeginInfo)
struct oxr_session* sess; struct oxr_session* sess;
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameBeginInfo, // NULL explicitly allowed here because it's a basically empty struct.
XR_TYPE_FRAME_BEGIN_INFO); if (frameBeginInfo != NULL) {
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO);
}
return oxr_session_frame_begin(&log, sess); return oxr_session_frame_begin(&log, sess);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment