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: rename OXR_VERIFY_ARG_TYPE_AND_NULL to …_NOT_NULL

Browse source
This commit is contained in:
Simon Ser 2019-11-05 10:15:33 +01:00
parent 072e9afb54
commit 1b51db68f9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
8 changed files with 73 additions and 65 deletions

42
src/xrt/state_trackers/oxr/oxr_api_action.c
View file

@ -31,7 +31,8 @@ oxr_xrSyncActions(XrSession session, const XrActionsSyncInfo *syncInfo)
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, "xrSyncActions"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrSyncActions");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, syncInfo, XR_TYPE_ACTIONS_SYNC_INFO); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, syncInfo,
XR_TYPE_ACTIONS_SYNC_INFO);
if (syncInfo->countActiveActionSets == 0) { if (syncInfo->countActiveActionSets == 0) {
return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE, return oxr_error(&log, XR_ERROR_VALIDATION_FAILURE,
@ -60,8 +61,8 @@ oxr_xrAttachSessionActionSets(XrSession session,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrAttachSessionActionSets"); "xrAttachSessionActionSets");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, bindInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
XR_TYPE_SESSION_ACTION_SETS_ATTACH_INFO); &log, bindInfo, XR_TYPE_SESSION_ACTION_SETS_ATTACH_INFO);
for (uint32_t i = 0; i < bindInfo->countActionSets; i++) { for (uint32_t i = 0; i < bindInfo->countActionSets; i++) {
struct oxr_action_set *act_set = NULL; struct oxr_action_set *act_set = NULL;
@ -81,7 +82,7 @@ oxr_xrSuggestInteractionProfileBindings(
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrSuggestInteractionProfileBindings"); "xrSuggestInteractionProfileBindings");
OXR_VERIFY_ARG_TYPE_AND_NULL( OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
&log, suggestedBindings, &log, suggestedBindings,
XR_TYPE_INTERACTION_PROFILE_SUGGESTED_BINDING); XR_TYPE_INTERACTION_PROFILE_SUGGESTED_BINDING);
@ -109,7 +110,7 @@ oxr_xrGetCurrentInteractionProfile(
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrGetCurrentInteractionProfile"); "xrGetCurrentInteractionProfile");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, interactionProfile, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, interactionProfile,
XR_TYPE_INTERACTION_PROFILE_STATE); XR_TYPE_INTERACTION_PROFILE_STATE);
/* XXX: How do we return XR_SESSION_LOSS_PENDING here? */ /* XXX: How do we return XR_SESSION_LOSS_PENDING here? */
@ -154,7 +155,7 @@ oxr_xrCreateActionSet(XrInstance instance,
XrResult ret; XrResult ret;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrCreateActionSet"); "xrCreateActionSet");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_ACTION_SET_CREATE_INFO); XR_TYPE_ACTION_SET_CREATE_INFO);
OXR_VERIFY_ARG_NOT_NULL(&log, actionSet); OXR_VERIFY_ARG_NOT_NULL(&log, actionSet);
OXR_VERIFY_ARG_SINGLE_LEVEL_FIXED_LENGTH_PATH( OXR_VERIFY_ARG_SINGLE_LEVEL_FIXED_LENGTH_PATH(
@ -201,7 +202,7 @@ oxr_xrCreateAction(XrActionSet actionSet,
OXR_VERIFY_ACTIONSET_AND_INIT_LOG(&log, actionSet, act_set, OXR_VERIFY_ACTIONSET_AND_INIT_LOG(&log, actionSet, act_set,
"xrCreateAction"); "xrCreateAction");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_ACTION_CREATE_INFO); XR_TYPE_ACTION_CREATE_INFO);
OXR_VERIFY_ARG_SINGLE_LEVEL_FIXED_LENGTH_PATH(&log, OXR_VERIFY_ARG_SINGLE_LEVEL_FIXED_LENGTH_PATH(&log,
createInfo->actionName); createInfo->actionName);
@ -249,8 +250,9 @@ oxr_xrGetActionStateBoolean(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrGetActionStateBoolean"); "xrGetActionStateBoolean");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, data, XR_TYPE_ACTION_STATE_BOOLEAN); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, data,
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, getInfo, XR_TYPE_ACTION_STATE_BOOLEAN);
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, getInfo,
XR_TYPE_ACTION_STATE_GET_INFO); XR_TYPE_ACTION_STATE_GET_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act);
@ -281,8 +283,9 @@ oxr_xrGetActionStateFloat(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrGetActionStateFloat"); "xrGetActionStateFloat");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, data, XR_TYPE_ACTION_STATE_FLOAT); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, data,
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, getInfo, XR_TYPE_ACTION_STATE_FLOAT);
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, getInfo,
XR_TYPE_ACTION_STATE_GET_INFO); XR_TYPE_ACTION_STATE_GET_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act);
@ -313,8 +316,9 @@ oxr_xrGetActionStateVector2f(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrGetActionStateVector2f"); "xrGetActionStateVector2f");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, data, XR_TYPE_ACTION_STATE_VECTOR2F); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, data,
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, getInfo, XR_TYPE_ACTION_STATE_VECTOR2F);
OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, getInfo,
XR_TYPE_ACTION_STATE_GET_INFO); XR_TYPE_ACTION_STATE_GET_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act);
@ -345,8 +349,8 @@ oxr_xrGetActionStatePose(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrGetActionStatePose"); "xrGetActionStatePose");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, data, XR_TYPE_ACTION_STATE_POSE); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, data, XR_TYPE_ACTION_STATE_POSE);
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, getInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, getInfo,
XR_TYPE_ACTION_STATE_GET_INFO); XR_TYPE_ACTION_STATE_GET_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, getInfo->action, act);
@ -378,7 +382,7 @@ oxr_xrEnumerateBoundSourcesForAction(
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrEnumerateBoundSourcesForAction"); "xrEnumerateBoundSourcesForAction");
OXR_VERIFY_ARG_TYPE_AND_NULL( OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
&log, enumerateInfo, &log, enumerateInfo,
XR_TYPE_BOUND_SOURCES_FOR_ACTION_ENUMERATE_INFO); XR_TYPE_BOUND_SOURCES_FOR_ACTION_ENUMERATE_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, enumerateInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, enumerateInfo->action, act);
@ -407,9 +411,9 @@ oxr_xrApplyHapticFeedback(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrApplyHapticFeedback"); "xrApplyHapticFeedback");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, hapticActionInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, hapticActionInfo,
XR_TYPE_HAPTIC_ACTION_INFO); XR_TYPE_HAPTIC_ACTION_INFO);
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, hapticEvent, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, hapticEvent,
XR_TYPE_HAPTIC_VIBRATION); XR_TYPE_HAPTIC_VIBRATION);
OXR_VERIFY_ACTION_NOT_NULL(&log, hapticActionInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, hapticActionInfo->action, act);
@ -440,7 +444,7 @@ oxr_xrStopHapticFeedback(XrSession session,
XrResult ret; XrResult ret;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrStopHapticFeedback"); "xrStopHapticFeedback");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, hapticActionInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, hapticActionInfo,
XR_TYPE_HAPTIC_ACTION_INFO); XR_TYPE_HAPTIC_ACTION_INFO);
OXR_VERIFY_ACTION_NOT_NULL(&log, hapticActionInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, hapticActionInfo->action, act);

2
src/xrt/state_trackers/oxr/oxr_api_debug.c
View file

@ -40,7 +40,7 @@ oxr_xrCreateDebugUtilsMessengerEXT(
"xrCreateDebugUtilsMessengerEXT"); "xrCreateDebugUtilsMessengerEXT");
OXR_VERIFY_EXTENSION(&log, inst, EXT_debug_utils); OXR_VERIFY_EXTENSION(&log, inst, EXT_debug_utils);
OXR_VERIFY_ARG_TYPE_AND_NULL( OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
&log, createInfo, XR_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT); &log, createInfo, XR_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT);
OXR_VERIFY_ARG_NOT_NULL(&log, messenger); OXR_VERIFY_ARG_NOT_NULL(&log, messenger);

2
src/xrt/state_trackers/oxr/oxr_api_instance.c
View file

@ -55,7 +55,7 @@ oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo,
XrResult ret; XrResult ret;
struct oxr_logger log; struct oxr_logger log;
oxr_log_init(&log, "xrCreateInstance"); oxr_log_init(&log, "xrCreateInstance");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_INSTANCE_CREATE_INFO); XR_TYPE_INSTANCE_CREATE_INFO);
const uint32_t major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION); const uint32_t major = XR_VERSION_MAJOR(XR_CURRENT_API_VERSION);
const uint32_t minor = XR_VERSION_MINOR(XR_CURRENT_API_VERSION); const uint32_t minor = XR_VERSION_MINOR(XR_CURRENT_API_VERSION);

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

@ -84,7 +84,7 @@ oxr_xrBeginSession(XrSession session, const XrSessionBeginInfo *beginInfo)
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, "xrBeginSession"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginSession");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, beginInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, beginInfo,
XR_TYPE_SESSION_BEGIN_INFO); XR_TYPE_SESSION_BEGIN_INFO);
return oxr_session_begin(&log, sess, beginInfo); return oxr_session_begin(&log, sess, beginInfo);
@ -108,7 +108,7 @@ oxr_xrWaitFrame(XrSession session,
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, "xrWaitFrame"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameState, XR_TYPE_FRAME_STATE); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, frameState, XR_TYPE_FRAME_STATE);
OXR_VERIFY_ARG_NOT_NULL(&log, frameState); OXR_VERIFY_ARG_NOT_NULL(&log, frameState);
return oxr_session_frame_wait(&log, sess, frameState); return oxr_session_frame_wait(&log, sess, frameState);
@ -122,7 +122,7 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame");
// NULL explicitly allowed here because it's a basically empty struct. // NULL explicitly allowed here because it's a basically empty struct.
if (frameBeginInfo != NULL) { if (frameBeginInfo != NULL) {
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameBeginInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, frameBeginInfo,
XR_TYPE_FRAME_BEGIN_INFO); XR_TYPE_FRAME_BEGIN_INFO);
} }
@ -135,7 +135,7 @@ oxr_xrEndFrame(XrSession session, const XrFrameEndInfo *frameEndInfo)
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, "xrEndFrame"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrEndFrame");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, frameEndInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, frameEndInfo,
XR_TYPE_FRAME_END_INFO); XR_TYPE_FRAME_END_INFO);
return oxr_session_frame_end(&log, sess, frameEndInfo); return oxr_session_frame_end(&log, sess, frameEndInfo);
@ -164,10 +164,10 @@ oxr_xrLocateViews(XrSession session,
struct oxr_space *spc; struct oxr_space *spc;
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrLocateViews"); OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrLocateViews");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, viewLocateInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, viewLocateInfo,
XR_TYPE_VIEW_LOCATE_INFO); XR_TYPE_VIEW_LOCATE_INFO);
OXR_VERIFY_SPACE_NOT_NULL(&log, viewLocateInfo->space, spc); OXR_VERIFY_SPACE_NOT_NULL(&log, viewLocateInfo->space, spc);
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, viewState, XR_TYPE_VIEW_STATE); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, viewState, XR_TYPE_VIEW_STATE);
if (viewCapacityInput == 0) { if (viewCapacityInput == 0) {
OXR_VERIFY_ARG_NOT_NULL(&log, viewCountOutput); OXR_VERIFY_ARG_NOT_NULL(&log, viewCountOutput);

7
src/xrt/state_trackers/oxr/oxr_api_space.c
View file

@ -34,7 +34,7 @@ oxr_xrCreateActionSpace(XrSession session,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrCreateActionSpace"); "xrCreateActionSpace");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_ACTION_SPACE_CREATE_INFO); XR_TYPE_ACTION_SPACE_CREATE_INFO);
OXR_VERIFY_POSE(&log, createInfo->poseInActionSpace); OXR_VERIFY_POSE(&log, createInfo->poseInActionSpace);
OXR_VERIFY_ACTION_NOT_NULL(&log, createInfo->action, act); OXR_VERIFY_ACTION_NOT_NULL(&log, createInfo->action, act);
@ -99,7 +99,7 @@ oxr_xrCreateReferenceSpace(XrSession session,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrCreateReferenceSpace"); "xrCreateReferenceSpace");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_REFERENCE_SPACE_CREATE_INFO); XR_TYPE_REFERENCE_SPACE_CREATE_INFO);
OXR_VERIFY_POSE(&log, createInfo->poseInReferenceSpace); OXR_VERIFY_POSE(&log, createInfo->poseInReferenceSpace);
@ -124,7 +124,8 @@ oxr_xrLocateSpace(XrSpace space,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SPACE_AND_INIT_LOG(&log, space, spc, "xrLocateSpace"); OXR_VERIFY_SPACE_AND_INIT_LOG(&log, space, spc, "xrLocateSpace");
OXR_VERIFY_SPACE_NOT_NULL(&log, baseSpace, baseSpc); OXR_VERIFY_SPACE_NOT_NULL(&log, baseSpace, baseSpc);
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, location, XR_TYPE_SPACE_LOCATION); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, location,
XR_TYPE_SPACE_LOCATION);
return oxr_space_locate(&log, spc, baseSpc, time, location); return oxr_space_locate(&log, spc, baseSpc, time, location);
} }

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

@ -54,7 +54,7 @@ oxr_xrCreateSwapchain(XrSession session,
&log, XR_ERROR_VALIDATION_FAILURE, &log, XR_ERROR_VALIDATION_FAILURE,
"xrCreateSwapchain is illegal in headless sessions"); "xrCreateSwapchain is illegal in headless sessions");
} }
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, createInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, createInfo,
XR_TYPE_SWAPCHAIN_CREATE_INFO); XR_TYPE_SWAPCHAIN_CREATE_INFO);
OXR_VERIFY_ARG_NOT_NULL(&log, out_swapchain); OXR_VERIFY_ARG_NOT_NULL(&log, out_swapchain);
@ -120,7 +120,7 @@ oxr_xrAcquireSwapchainImage(XrSwapchain swapchain,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc,
"xrAcquireSwapchainImage"); "xrAcquireSwapchainImage");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, acquireInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, acquireInfo,
XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO); XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO);
OXR_VERIFY_ARG_NOT_NULL(&log, index); OXR_VERIFY_ARG_NOT_NULL(&log, index);
@ -135,7 +135,7 @@ oxr_xrWaitSwapchainImage(XrSwapchain swapchain,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc,
"xrWaitSwapchainImage"); "xrWaitSwapchainImage");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, waitInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, waitInfo,
XR_TYPE_SWAPCHAIN_IMAGE_WAIT_INFO); XR_TYPE_SWAPCHAIN_IMAGE_WAIT_INFO);
return sc->wait_image(&log, sc, waitInfo); return sc->wait_image(&log, sc, waitInfo);
@ -149,7 +149,7 @@ oxr_xrReleaseSwapchainImage(XrSwapchain swapchain,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc,
"xrReleaseSwapchainImage"); "xrReleaseSwapchainImage");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, releaseInfo, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, releaseInfo,
XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO); XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO);
return sc->release_image(&log, sc, releaseInfo); return sc->release_image(&log, sc, releaseInfo);

13
src/xrt/state_trackers/oxr/oxr_api_system.c
View file

@ -46,7 +46,8 @@ oxr_xrGetSystem(XrInstance instance,
struct oxr_instance *inst; struct oxr_instance *inst;
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetSystem"); OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetSystem");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, getInfo, XR_TYPE_SYSTEM_GET_INFO); OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, getInfo,
XR_TYPE_SYSTEM_GET_INFO);
OXR_VERIFY_ARG_NOT_NULL(&log, systemId); OXR_VERIFY_ARG_NOT_NULL(&log, systemId);
struct oxr_system *selected = NULL; struct oxr_system *selected = NULL;
@ -73,7 +74,7 @@ oxr_xrGetSystemProperties(XrInstance instance,
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrGetSystemProperties"); "xrGetSystemProperties");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, properties, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, properties,
XR_TYPE_SYSTEM_PROPERTIES); XR_TYPE_SYSTEM_PROPERTIES);
OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys); OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys);
@ -130,7 +131,7 @@ oxr_xrGetViewConfigurationProperties(
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrGetViewConfigurationProperties"); "xrGetViewConfigurationProperties");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, configurationProperties, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, configurationProperties,
XR_TYPE_VIEW_CONFIGURATION_PROPERTIES); XR_TYPE_VIEW_CONFIGURATION_PROPERTIES);
OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys); OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys);
@ -177,7 +178,8 @@ oxr_xrGetOpenGLGraphicsRequirementsKHR(
struct oxr_logger log; struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrGetOpenGLGraphicsRequirementsKHR"); "xrGetOpenGLGraphicsRequirementsKHR");
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, graphicsRequirements, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
&log, graphicsRequirements,
XR_TYPE_GRAPHICS_REQUIREMENTS_OPENGL_KHR); XR_TYPE_GRAPHICS_REQUIREMENTS_OPENGL_KHR);
OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys); OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys);
@ -270,7 +272,8 @@ oxr_xrGetVulkanGraphicsRequirementsKHR(
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst,
"xrGetVulkanGraphicsRequirementsKHR"); "xrGetVulkanGraphicsRequirementsKHR");
OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys); OXR_VERIFY_SYSTEM_AND_GET(&log, inst, systemId, sys);
OXR_VERIFY_ARG_TYPE_AND_NULL(&log, graphicsRequirements, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(
&log, graphicsRequirements,
XR_TYPE_GRAPHICS_REQUIREMENTS_VULKAN_KHR); XR_TYPE_GRAPHICS_REQUIREMENTS_VULKAN_KHR);
return oxr_vk_get_requirements(&log, sys, graphicsRequirements); return oxr_vk_get_requirements(&log, sys, graphicsRequirements);

2
src/xrt/state_trackers/oxr/oxr_api_verify.h
View file

@ -112,7 +112,7 @@ extern "C" {
} \ } \
} while (false) } while (false)
#define OXR_VERIFY_ARG_TYPE_AND_NULL(log, arg, type_enum) \ #define OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(log, arg, type_enum) \
do { \ do { \
if (arg == NULL) { \ if (arg == NULL) { \
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, \ return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, \