st/oxr: Trace markers

src/xrt/state_trackers/oxr/oxr_api_action.c

@@ -12,6 +12,7 @@
 #include "oxr_handle.h"
 
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
 
 #include "oxr_api_funcs.h"
 #include "oxr_api_verify.h"
@@ -31,6 +32,8 @@
 XrResult
 oxr_xrSyncActions(XrSession session, const XrActionsSyncInfo *syncInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrSyncActions");
@@ -57,6 +60,8 @@ oxr_xrSyncActions(XrSession session, const XrActionsSyncInfo *syncInfo)
 XrResult
 oxr_xrAttachSessionActionSets(XrSession session, const XrSessionActionSetsAttachInfo *bindInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrAttachSessionActionSets");
@@ -86,6 +91,8 @@ XrResult
 oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
                                         const XrInteractionProfileSuggestedBinding *suggestedBindings)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrSuggestInteractionProfileBindings");
@@ -174,6 +181,8 @@ oxr_xrGetCurrentInteractionProfile(XrSession session,
                                    XrPath topLevelUserPath,
                                    XrInteractionProfileState *interactionProfile)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst = NULL;
 	struct oxr_session *sess = NULL;
 	struct oxr_logger log;
@@ -224,6 +233,8 @@ oxr_xrGetInputSourceLocalizedName(XrSession session,
                                   uint32_t *bufferCountOutput,
                                   char *buffer)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst = NULL;
 	struct oxr_session *sess;
 	struct oxr_logger log;
@@ -276,6 +287,8 @@ oxr_xrGetInputSourceLocalizedName(XrSession session,
 XrResult
 oxr_xrCreateActionSet(XrInstance instance, const XrActionSetCreateInfo *createInfo, XrActionSet *actionSet)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_action_set *act_set = NULL;
 	struct oxr_instance *inst = NULL;
 	struct u_hashset_item *d = NULL;
@@ -325,6 +338,8 @@ oxr_xrCreateActionSet(XrInstance instance, const XrActionSetCreateInfo *createIn
 XrResult
 oxr_xrDestroyActionSet(XrActionSet actionSet)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_action_set *act_set;
 	struct oxr_logger log;
 	OXR_VERIFY_ACTIONSET_AND_INIT_LOG(&log, actionSet, act_set, "xrDestroyActionSet");
@@ -342,6 +357,8 @@ oxr_xrDestroyActionSet(XrActionSet actionSet)
 XrResult
 oxr_xrCreateAction(XrActionSet actionSet, const XrActionCreateInfo *createInfo, XrAction *action)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_action_set *act_set;
 	struct u_hashset_item *d = NULL;
 	struct oxr_action *act = NULL;
@@ -405,6 +422,8 @@ oxr_xrCreateAction(XrActionSet actionSet, const XrActionCreateInfo *createInfo,
 XrResult
 oxr_xrDestroyAction(XrAction action)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_action *act;
 	struct oxr_logger log;
 	OXR_VERIFY_ACTION_AND_INIT_LOG(&log, action, act, "xrDestroyAction");
@@ -415,6 +434,8 @@ oxr_xrDestroyAction(XrAction action)
 XrResult
 oxr_xrGetActionStateBoolean(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateBoolean *data)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};
@@ -441,6 +462,8 @@ oxr_xrGetActionStateBoolean(XrSession session, const XrActionStateGetInfo *getIn
 XrResult
 oxr_xrGetActionStateFloat(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateFloat *data)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};
@@ -467,6 +490,8 @@ oxr_xrGetActionStateFloat(XrSession session, const XrActionStateGetInfo *getInfo
 XrResult
 oxr_xrGetActionStateVector2f(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateVector2f *data)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};
@@ -493,6 +518,8 @@ oxr_xrGetActionStateVector2f(XrSession session, const XrActionStateGetInfo *getI
 XrResult
 oxr_xrGetActionStatePose(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStatePose *data)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};
@@ -523,6 +550,8 @@ oxr_xrEnumerateBoundSourcesForAction(XrSession session,
                                      uint32_t *sourceCountOutput,
                                      XrPath *sources)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_logger log;
@@ -552,6 +581,8 @@ oxr_xrApplyHapticFeedback(XrSession session,
                           const XrHapticActionInfo *hapticActionInfo,
                           const XrHapticBaseHeader *hapticEvent)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};
@@ -578,6 +609,8 @@ oxr_xrApplyHapticFeedback(XrSession session,
 XrResult
 oxr_xrStopHapticFeedback(XrSession session, const XrHapticActionInfo *hapticActionInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess = NULL;
 	struct oxr_action *act = NULL;
 	struct oxr_subaction_paths subaction_paths = {0};

src/xrt/state_trackers/oxr/oxr_api_debug.c

@@ -7,6 +7,8 @@
  * @ingroup oxr_api
  */
 
+#include "util/u_trace_marker.h"
+
 #include "oxr_objects.h"
 #include "oxr_logger.h"
 
@@ -18,6 +20,8 @@
 XrResult
 oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance, const XrDebugUtilsObjectNameInfoEXT *nameInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrSetDebugUtilsObjectNameEXT");
@@ -30,6 +34,8 @@ oxr_xrCreateDebugUtilsMessengerEXT(XrInstance instance,
                                    const XrDebugUtilsMessengerCreateInfoEXT *createInfo,
                                    XrDebugUtilsMessengerEXT *messenger)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_debug_messenger *mssngr;
 	struct oxr_logger log;
@@ -52,6 +58,8 @@ oxr_xrCreateDebugUtilsMessengerEXT(XrInstance instance,
 XrResult
 oxr_xrDestroyDebugUtilsMessengerEXT(XrDebugUtilsMessengerEXT messenger)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_debug_messenger *mssngr;
 	struct oxr_logger log;
 	OXR_VERIFY_MESSENGER_AND_INIT_LOG(&log, messenger, mssngr, "xrDestroyDebugUtilsMessengerEXT");
@@ -66,6 +74,8 @@ oxr_xrSubmitDebugUtilsMessageEXT(XrInstance instance,
                                  XrDebugUtilsMessageTypeFlagsEXT messageTypes,
                                  const XrDebugUtilsMessengerCallbackDataEXT *callbackData)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrSubmitDebugUtilsMessageEXT");
@@ -78,6 +88,8 @@ oxr_xrSubmitDebugUtilsMessageEXT(XrInstance instance,
 XrResult
 oxr_xrSessionBeginDebugUtilsLabelRegionEXT(XrSession session, const XrDebugUtilsLabelEXT *labelInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrSessionBeginDebugUtilsLabelRegionEXT");
@@ -89,6 +101,8 @@ oxr_xrSessionBeginDebugUtilsLabelRegionEXT(XrSession session, const XrDebugUtils
 XrResult
 oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrSessionEndDebugUtilsLabelRegionEXT");
@@ -100,6 +114,8 @@ oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session)
 XrResult
 oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session, const XrDebugUtilsLabelEXT *labelInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrSessionInsertDebugUtilsLabelEXT");

src/xrt/state_trackers/oxr/oxr_api_instance.c

@@ -10,6 +10,7 @@
 #include "xrt/xrt_compiler.h"
 
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -39,6 +40,8 @@ oxr_xrEnumerateInstanceExtensionProperties(const char *layerName,
                                            uint32_t *propertyCountOutput,
                                            XrExtensionProperties *properties)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_logger log;
 	oxr_log_init(&log, "xrEnumerateInstanceExtensionProperties");
 
@@ -94,6 +97,8 @@ oxr_check_android_extensions(struct oxr_logger *log, const XrInstanceCreateInfo
 XrResult
 oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *out_instance)
 {
+	OXR_TRACE_MARKER();
+
 	XrResult ret;
 	struct oxr_logger log;
 	oxr_log_init(&log, "xrCreateInstance");
@@ -160,6 +165,8 @@ oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *out_ins
 XrResult
 oxr_xrDestroyInstance(XrInstance instance)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrDestroyInstance");
@@ -170,6 +177,8 @@ oxr_xrDestroyInstance(XrInstance instance)
 XrResult
 oxr_xrGetInstanceProperties(XrInstance instance, XrInstanceProperties *instanceProperties)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetInstanceProperties");
@@ -180,6 +189,8 @@ oxr_xrGetInstanceProperties(XrInstance instance, XrInstanceProperties *instanceP
 XrResult
 oxr_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventData)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrPollEvent");
@@ -191,6 +202,8 @@ oxr_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventData)
 XrResult
 oxr_xrResultToString(XrInstance instance, XrResult value, char buffer[XR_MAX_RESULT_STRING_SIZE])
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrResultToString");
@@ -211,6 +224,8 @@ oxr_xrResultToString(XrInstance instance, XrResult value, char buffer[XR_MAX_RES
 XrResult
 oxr_xrStructureTypeToString(XrInstance instance, XrStructureType value, char buffer[XR_MAX_STRUCTURE_NAME_SIZE])
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrStructureTypeToString");
@@ -229,6 +244,8 @@ oxr_xrStructureTypeToString(XrInstance instance, XrStructureType value, char buf
 XrResult
 oxr_xrStringToPath(XrInstance instance, const char *pathString, XrPath *out_path)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	XrResult ret;
@@ -254,6 +271,8 @@ XrResult
 oxr_xrPathToString(
     XrInstance instance, XrPath path, uint32_t bufferCapacityInput, uint32_t *bufferCountOutput, char *buffer)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	const char *str;
@@ -283,6 +302,8 @@ oxr_xrPathToString(
 XrResult
 oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *timespecTime, XrTime *time)
 {
+	OXR_TRACE_MARKER();
+
 	//! @todo do we need to check and see if this extension was
 	//! enabled first?
 	struct oxr_instance *inst;
@@ -297,6 +318,8 @@ oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *t
 XrResult
 oxr_xrConvertTimeToTimespecTimeKHR(XrInstance instance, XrTime time, struct timespec *timespecTime)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrConvertTimeToTimespecTimeKHR");

src/xrt/state_trackers/oxr/oxr_api_session.c

@@ -15,6 +15,7 @@
 #include "xrt/xrt_compiler.h"
 
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -28,6 +29,8 @@
 XrResult
 oxr_xrCreateSession(XrInstance instance, const XrSessionCreateInfo *createInfo, XrSession *out_session)
 {
+	OXR_TRACE_MARKER();
+
 	XrResult ret;
 	struct oxr_instance *inst;
 	struct oxr_session *sess, **link;
@@ -59,6 +62,8 @@ oxr_xrCreateSession(XrInstance instance, const XrSessionCreateInfo *createInfo,
 XrResult
 oxr_xrDestroySession(XrSession session)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess, **link;
 	struct oxr_instance *inst;
 	struct oxr_logger log;
@@ -78,6 +83,8 @@ oxr_xrDestroySession(XrSession session)
 XrResult
 oxr_xrBeginSession(XrSession session, const XrSessionBeginInfo *beginInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginSession");
@@ -90,6 +97,8 @@ oxr_xrBeginSession(XrSession session, const XrSessionBeginInfo *beginInfo)
 XrResult
 oxr_xrEndSession(XrSession session)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrEndSession");
@@ -100,6 +109,8 @@ oxr_xrEndSession(XrSession session)
 XrResult
 oxr_xrWaitFrame(XrSession session, const XrFrameWaitInfo *frameWaitInfo, XrFrameState *frameState)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrWaitFrame");
@@ -113,6 +124,8 @@ oxr_xrWaitFrame(XrSession session, const XrFrameWaitInfo *frameWaitInfo, XrFrame
 XrResult
 oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrBeginFrame");
@@ -125,6 +138,8 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
 XrResult
 oxr_xrEndFrame(XrSession session, const XrFrameEndInfo *frameEndInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrEndFrame");
@@ -136,6 +151,8 @@ oxr_xrEndFrame(XrSession session, const XrFrameEndInfo *frameEndInfo)
 XrResult
 oxr_xrRequestExitSession(XrSession session)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrRequestExitSession");
@@ -151,6 +168,8 @@ oxr_xrLocateViews(XrSession session,
                   uint32_t *viewCountOutput,
                   XrView *views)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_space *spc;
 	struct oxr_logger log;
@@ -184,6 +203,8 @@ oxr_xrGetVisibilityMaskKHR(XrSession session,
                            XrVisibilityMaskTypeKHR visibilityMaskType,
                            XrVisibilityMaskKHR *visibilityMask)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrGetVisibilityMaskKHR");
@@ -207,6 +228,8 @@ oxr_xrPerfSettingsSetPerformanceLevelEXT(XrSession session,
                                          XrPerfSettingsDomainEXT domain,
                                          XrPerfSettingsLevelEXT level)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrPerfSettingsSetPerformanceLevelEXT");
@@ -232,6 +255,8 @@ oxr_xrThermalGetTemperatureTrendEXT(XrSession session,
                                     float *tempHeadroom,
                                     float *tempSlope)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrThermalGetTemperatureTrendEXT");

src/xrt/state_trackers/oxr/oxr_api_space.c

@@ -9,8 +9,10 @@
 
 #include "xrt/xrt_compiler.h"
 
-#include "math/m_api.h"
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
+
+#include "math/m_api.h"
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -28,6 +30,8 @@
 XrResult
 oxr_xrCreateActionSpace(XrSession session, const XrActionSpaceCreateInfo *createInfo, XrSpace *space)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_action *act;
 	struct oxr_logger log;
@@ -59,6 +63,8 @@ oxr_xrEnumerateReferenceSpaces(XrSession session,
                                uint32_t *spaceCountOutput,
                                XrReferenceSpaceType *spaces)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrEnumerateReferenceSpaces");
@@ -70,6 +76,8 @@ oxr_xrEnumerateReferenceSpaces(XrSession session,
 XrResult
 oxr_xrGetReferenceSpaceBoundsRect(XrSession session, XrReferenceSpaceType referenceSpaceType, XrExtent2Df *bounds)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrGetReferenceSpaceBoundsRect");
@@ -97,6 +105,8 @@ oxr_xrGetReferenceSpaceBoundsRect(XrSession session, XrReferenceSpaceType refere
 XrResult
 oxr_xrCreateReferenceSpace(XrSession session, const XrReferenceSpaceCreateInfo *createInfo, XrSpace *out_space)
 {
+	OXR_TRACE_MARKER();
+
 	XrResult ret;
 	struct oxr_session *sess;
 	struct oxr_space *spc = NULL;
@@ -118,6 +128,8 @@ oxr_xrCreateReferenceSpace(XrSession session, const XrReferenceSpaceCreateInfo *
 XrResult
 oxr_xrLocateSpace(XrSpace space, XrSpace baseSpace, XrTime time, XrSpaceLocation *location)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_space *spc;
 	struct oxr_space *baseSpc;
 	struct oxr_logger log;
@@ -137,6 +149,8 @@ oxr_xrLocateSpace(XrSpace space, XrSpace baseSpace, XrTime time, XrSpaceLocation
 XrResult
 oxr_xrDestroySpace(XrSpace space)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_space *spc;
 	struct oxr_logger log;
 	OXR_VERIFY_SPACE_AND_INIT_LOG(&log, space, spc, "xrDestroySpace");

src/xrt/state_trackers/oxr/oxr_api_swapchain.c

@@ -10,6 +10,7 @@
 #include "xrt/xrt_compiler.h"
 
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -30,6 +31,8 @@ oxr_xrEnumerateSwapchainFormats(XrSession session,
                                 uint32_t *formatCountOutput,
                                 int64_t *formats)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_session *sess;
 	struct oxr_logger log;
 	OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess, "xrEnumerateSwapchainFormats");
@@ -40,6 +43,8 @@ oxr_xrEnumerateSwapchainFormats(XrSession session,
 XrResult
 oxr_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo, XrSwapchain *out_swapchain)
 {
+	OXR_TRACE_MARKER();
+
 	XrResult ret;
 	struct oxr_session *sess;
 	struct oxr_swapchain *sc;
@@ -103,6 +108,8 @@ oxr_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo
 XrResult
 oxr_xrDestroySwapchain(XrSwapchain swapchain)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_swapchain *sc;
 	struct oxr_logger log;
 	OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, "xrDestroySwapchain");
@@ -116,6 +123,8 @@ oxr_xrEnumerateSwapchainImages(XrSwapchain swapchain,
                                uint32_t *imageCountOutput,
                                XrSwapchainImageBaseHeader *images)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_swapchain *sc;
 	struct oxr_logger log;
 	OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, "xrEnumerateSwapchainImages");
@@ -137,6 +146,8 @@ oxr_xrEnumerateSwapchainImages(XrSwapchain swapchain,
 XrResult
 oxr_xrAcquireSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageAcquireInfo *acquireInfo, uint32_t *index)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_swapchain *sc;
 	struct oxr_logger log;
 	OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, "xrAcquireSwapchainImage");
@@ -149,6 +160,8 @@ oxr_xrAcquireSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageAcquire
 XrResult
 oxr_xrWaitSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageWaitInfo *waitInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_swapchain *sc;
 	struct oxr_logger log;
 	OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, "xrWaitSwapchainImage");
@@ -160,6 +173,8 @@ oxr_xrWaitSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageWaitInfo *
 XrResult
 oxr_xrReleaseSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageReleaseInfo *releaseInfo)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_swapchain *sc;
 	struct oxr_logger log;
 	OXR_VERIFY_SWAPCHAIN_AND_INIT_LOG(&log, swapchain, sc, "xrReleaseSwapchainImage");

src/xrt/state_trackers/oxr/oxr_api_system.c

@@ -15,7 +15,9 @@
 #include "xrt/xrt_compiler.h"
 #include "xrt/xrt_gfx_gl.h"
 #include "xrt/xrt_gfx_gles.h"
+
 #include "util/u_debug.h"
+#include "util/u_trace_marker.h"
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -41,6 +43,8 @@
 XrResult
 oxr_xrGetSystem(XrInstance instance, const XrSystemGetInfo *getInfo, XrSystemId *systemId)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetSystem");
@@ -64,6 +68,8 @@ oxr_xrGetSystem(XrInstance instance, const XrSystemGetInfo *getInfo, XrSystemId
 XrResult
 oxr_xrGetSystemProperties(XrInstance instance, XrSystemId systemId, XrSystemProperties *properties)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetSystemProperties");
@@ -80,6 +86,8 @@ oxr_xrEnumerateViewConfigurations(XrInstance instance,
                                   uint32_t *viewConfigurationTypeCountOutput,
                                   XrViewConfigurationType *viewConfigurationTypes)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrEnumerateViewConfigurations");
@@ -97,6 +105,8 @@ oxr_xrEnumerateEnvironmentBlendModes(XrInstance instance,
                                      uint32_t *environmentBlendModeCountOutput,
                                      XrEnvironmentBlendMode *environmentBlendModes)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrEnumerateEnvironmentBlendModes");
@@ -120,6 +130,8 @@ oxr_xrGetViewConfigurationProperties(XrInstance instance,
                                      XrViewConfigurationType viewConfigurationType,
                                      XrViewConfigurationProperties *configurationProperties)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetViewConfigurationProperties");
@@ -137,6 +149,8 @@ oxr_xrEnumerateViewConfigurationViews(XrInstance instance,
                                       uint32_t *viewCountOutput,
                                       XrViewConfigurationView *views)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrEnumerateViewConfigurationViews");
@@ -160,6 +174,8 @@ oxr_xrGetOpenGLESGraphicsRequirementsKHR(XrInstance instance,
                                          XrSystemId systemId,
                                          XrGraphicsRequirementsOpenGLESKHR *graphicsRequirements)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetOpenGLESGraphicsRequirementsKHR");
@@ -194,6 +210,8 @@ oxr_xrGetOpenGLGraphicsRequirementsKHR(XrInstance instance,
                                        XrSystemId systemId,
                                        XrGraphicsRequirementsOpenGLKHR *graphicsRequirements)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetOpenGLGraphicsRequirementsKHR");
@@ -230,6 +248,8 @@ oxr_xrGetVulkanInstanceExtensionsKHR(XrInstance instance,
                                      uint32_t *namesCountOutput,
                                      char *namesString)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetVulkanInstanceExtensionsKHR");
@@ -245,6 +265,8 @@ oxr_xrGetVulkanDeviceExtensionsKHR(XrInstance instance,
                                    uint32_t *namesCountOutput,
                                    char *namesString)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetVulkanDeviceExtensionsKHR");
@@ -263,6 +285,8 @@ oxr_xrGetVulkanGraphicsDeviceKHR(XrInstance instance,
                                  VkInstance vkInstance,
                                  VkPhysicalDevice *vkPhysicalDevice)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetVulkanGraphicsDeviceKHR");
@@ -294,6 +318,8 @@ oxr_xrGetVulkanGraphicsRequirementsKHR(XrInstance instance,
                                        XrSystemId systemId,
                                        XrGraphicsRequirementsVulkanKHR *graphicsRequirements)
 {
+	OXR_TRACE_MARKER();
+
 	struct oxr_instance *inst;
 	struct oxr_logger log;
 	OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrGetVulkanGraphicsRequirementsKHR");