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

xrt: allow NULL args in various functions

Browse source 
The spec says NULL arguments are valid when the argument just exists for
extensibility. Fix the implementation to accept NULL args.
This commit is contained in:
Simon Ser 2019-10-31 16:57:44 +01:00
parent 8ade6b654b
commit 9183f53c5f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 8 additions and 8 deletions
src/xrt/state_trackers/oxr
oxr_api_session.coxr_api_swapchain.c

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

@ -108,6 +108,8 @@ oxr_xrWaitFrame(XrSession session,
struct oxr_session *sess;
struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame");
OXR_VERIFY_ARG_TYPE_CAN_BE_NULL(&log, frameWaitInfo,
XR_TYPE_FRAME_WAIT_INFO);
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, frameState, XR_TYPE_FRAME_STATE);
OXR_VERIFY_ARG_NOT_NULL(&log, frameState);
@ -121,10 +123,8 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame");
// NULL explicitly allowed here because it's a basically empty struct.
if (frameBeginInfo != NULL) {
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO);
}
OXR_VERIFY_ARG_TYPE_CAN_BE_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO);
return oxr_session_frame_begin(&log, sess);
}

8
src/xrt/state_trackers/oxr/oxr_api_swapchain.c
View file

@ -120,8 +120,8 @@ oxr_xrAcquireSwapchainImage(XrSwapchain swapchain,
struct oxr_logger log;
OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc,
"xrAcquireSwapchainImage");
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, acquireInfo,
XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO);
OXR_VERIFY_ARG_TYPE_CAN_BE_NULL(&log, acquireInfo,
XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO);
OXR_VERIFY_ARG_NOT_NULL(&log, index);
return sc->acquire_image(&log, sc, acquireInfo, index);
@ -149,8 +149,8 @@ oxr_xrReleaseSwapchainImage(XrSwapchain swapchain,
struct oxr_logger log;
OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc,
"xrReleaseSwapchainImage");
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, releaseInfo,
XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO);
OXR_VERIFY_ARG_TYPE_CAN_BE_NULL(&log, releaseInfo,
XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO);
return sc->release_image(&log, sc, releaseInfo);
}