st/oxr: Add missing calling convention macros for entry points.

Fixes 32-bit Windows build.

src/xrt/state_trackers/oxr/oxr_api_action.c

@@ -123,7 +123,7 @@ process_dpad(struct oxr_logger *log,
  *
  */
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSyncActions(XrSession session, const XrActionsSyncInfo *syncInfo)
 {
 	OXR_TRACE_MARKER();
@@ -151,7 +151,7 @@ oxr_xrSyncActions(XrSession session, const XrActionsSyncInfo *syncInfo)
 	return oxr_action_sync_data(&log, sess, syncInfo->countActiveActionSets, syncInfo->activeActionSets);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrAttachSessionActionSets(XrSession session, const XrSessionActionSetsAttachInfo *bindInfo)
 {
 	OXR_TRACE_MARKER();
@@ -181,7 +181,7 @@ oxr_xrAttachSessionActionSets(XrSession session, const XrSessionActionSetsAttach
 	return oxr_session_attach_action_sets(&log, sess, bindInfo);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
                                         const XrInteractionProfileSuggestedBinding *suggestedBindings)
 {
@@ -392,7 +392,7 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
 	return oxr_action_suggest_interaction_profile_bindings(&log, inst, suggestedBindings, &dpad_state);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetCurrentInteractionProfile(XrSession session,
                                    XrPath topLevelUserPath,
                                    XrInteractionProfileState *interactionProfile)
@@ -442,7 +442,7 @@ oxr_xrGetCurrentInteractionProfile(XrSession session,
 	return oxr_action_get_current_interaction_profile(&log, sess, topLevelUserPath, interactionProfile);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetInputSourceLocalizedName(XrSession session,
                                   const XrInputSourceLocalizedNameGetInfo *getInfo,
                                   uint32_t bufferCapacityInput,
@@ -500,7 +500,7 @@ oxr_xrGetInputSourceLocalizedName(XrSession session,
  *
  */
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateActionSet(XrInstance instance, const XrActionSetCreateInfo *createInfo, XrActionSet *actionSet)
 {
 	OXR_TRACE_MARKER();
@@ -551,7 +551,7 @@ oxr_xrCreateActionSet(XrInstance instance, const XrActionSetCreateInfo *createIn
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroyActionSet(XrActionSet actionSet)
 {
 	OXR_TRACE_MARKER();
@@ -570,7 +570,7 @@ oxr_xrDestroyActionSet(XrActionSet actionSet)
  *
  */
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateAction(XrActionSet actionSet, const XrActionCreateInfo *createInfo, XrAction *action)
 {
 	OXR_TRACE_MARKER();
@@ -635,7 +635,7 @@ oxr_xrCreateAction(XrActionSet actionSet, const XrActionCreateInfo *createInfo,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroyAction(XrAction action)
 {
 	OXR_TRACE_MARKER();
@@ -647,7 +647,7 @@ oxr_xrDestroyAction(XrAction action)
 	return oxr_handle_destroy(&log, &act->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetActionStateBoolean(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateBoolean *data)
 {
 	OXR_TRACE_MARKER();
@@ -675,7 +675,7 @@ oxr_xrGetActionStateBoolean(XrSession session, const XrActionStateGetInfo *getIn
 	return oxr_action_get_boolean(&log, sess, act->act_key, subaction_paths, data);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetActionStateFloat(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateFloat *data)
 {
 	OXR_TRACE_MARKER();
@@ -703,7 +703,7 @@ oxr_xrGetActionStateFloat(XrSession session, const XrActionStateGetInfo *getInfo
 	return oxr_action_get_vector1f(&log, sess, act->act_key, subaction_paths, data);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetActionStateVector2f(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStateVector2f *data)
 {
 	OXR_TRACE_MARKER();
@@ -731,7 +731,7 @@ oxr_xrGetActionStateVector2f(XrSession session, const XrActionStateGetInfo *getI
 	return oxr_action_get_vector2f(&log, sess, act->act_key, subaction_paths, data);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetActionStatePose(XrSession session, const XrActionStateGetInfo *getInfo, XrActionStatePose *data)
 {
 	OXR_TRACE_MARKER();
@@ -759,7 +759,7 @@ oxr_xrGetActionStatePose(XrSession session, const XrActionStateGetInfo *getInfo,
 	return oxr_action_get_pose(&log, sess, act->act_key, subaction_paths, data);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateBoundSourcesForAction(XrSession session,
                                      const XrBoundSourcesForActionEnumerateInfo *enumerateInfo,
                                      uint32_t sourceCapacityInput,
@@ -792,7 +792,7 @@ oxr_xrEnumerateBoundSourcesForAction(XrSession session,
  *
  */
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrApplyHapticFeedback(XrSession session,
                           const XrHapticActionInfo *hapticActionInfo,
                           const XrHapticBaseHeader *hapticEvent)
@@ -822,7 +822,7 @@ oxr_xrApplyHapticFeedback(XrSession session,
 	return oxr_action_apply_haptic_feedback(&log, sess, act->act_key, subaction_paths, hapticEvent);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrStopHapticFeedback(XrSession session, const XrHapticActionInfo *hapticActionInfo)
 {
 	OXR_TRACE_MARKER();

src/xrt/state_trackers/oxr/oxr_api_debug.c

@@ -17,7 +17,7 @@
 
 
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance, const XrDebugUtilsObjectNameInfoEXT *nameInfo)
 {
 	OXR_TRACE_MARKER();
@@ -29,7 +29,7 @@ oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance, const XrDebugUtilsObjectNa
 	return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented");
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateDebugUtilsMessengerEXT(XrInstance instance,
                                    const XrDebugUtilsMessengerCreateInfoEXT *createInfo,
                                    XrDebugUtilsMessengerEXT *messenger)
@@ -55,7 +55,7 @@ oxr_xrCreateDebugUtilsMessengerEXT(XrInstance instance,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroyDebugUtilsMessengerEXT(XrDebugUtilsMessengerEXT messenger)
 {
 	OXR_TRACE_MARKER();
@@ -68,7 +68,7 @@ oxr_xrDestroyDebugUtilsMessengerEXT(XrDebugUtilsMessengerEXT messenger)
 	return oxr_handle_destroy(&log, &mssngr->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSubmitDebugUtilsMessageEXT(XrInstance instance,
                                  XrDebugUtilsMessageSeverityFlagsEXT messageSeverity,
                                  XrDebugUtilsMessageTypeFlagsEXT messageTypes,
@@ -85,7 +85,7 @@ oxr_xrSubmitDebugUtilsMessageEXT(XrInstance instance,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSessionBeginDebugUtilsLabelRegionEXT(XrSession session, const XrDebugUtilsLabelEXT *labelInfo)
 {
 	OXR_TRACE_MARKER();
@@ -98,7 +98,7 @@ oxr_xrSessionBeginDebugUtilsLabelRegionEXT(XrSession session, const XrDebugUtils
 	return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented");
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session)
 {
 	OXR_TRACE_MARKER();
@@ -111,7 +111,7 @@ oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session)
 	return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented");
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session, const XrDebugUtilsLabelEXT *labelInfo)
 {
 	OXR_TRACE_MARKER();

src/xrt/state_trackers/oxr/oxr_api_instance.c

@@ -39,7 +39,7 @@
 	{XR_TYPE_EXTENSION_PROPERTIES, NULL, XR_##all_caps##_EXTENSION_NAME, XR_##mixed_case##_SPEC_VERSION},
 static const XrExtensionProperties extension_properties[] = {OXR_EXTENSION_SUPPORT_GENERATE(MAKE_EXTENSION_PROPERTIES)};
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateInstanceExtensionProperties(const char *layerName,
                                            uint32_t propertyCapacityInput,
                                            uint32_t *propertyCountOutput,
@@ -55,7 +55,7 @@ oxr_xrEnumerateInstanceExtensionProperties(const char *layerName,
 }
 
 #ifdef OXR_HAVE_KHR_loader_init
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrInitializeLoaderKHR(const XrLoaderInitInfoBaseHeaderKHR *loaderInitInfo)
 {
 	struct oxr_logger log;
@@ -129,7 +129,7 @@ oxr_check_android_extensions(struct oxr_logger *log,
 }
 #endif // XRT_OS_ANDROID
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *out_instance)
 {
 	OXR_TRACE_MARKER();
@@ -207,7 +207,7 @@ oxr_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *out_ins
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroyInstance(XrInstance instance)
 {
 	OXR_TRACE_MARKER();
@@ -219,7 +219,7 @@ oxr_xrDestroyInstance(XrInstance instance)
 	return oxr_handle_destroy(&log, &inst->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetInstanceProperties(XrInstance instance, XrInstanceProperties *instanceProperties)
 {
 	OXR_TRACE_MARKER();
@@ -231,7 +231,7 @@ oxr_xrGetInstanceProperties(XrInstance instance, XrInstanceProperties *instanceP
 	return oxr_instance_get_properties(&log, inst, instanceProperties);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventData)
 {
 	OXR_TRACE_MARKER();
@@ -244,7 +244,7 @@ oxr_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventData)
 	return oxr_poll_event(&log, inst, eventData);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrResultToString(XrInstance instance, XrResult value, char buffer[XR_MAX_RESULT_STRING_SIZE])
 {
 	OXR_TRACE_MARKER();
@@ -267,7 +267,7 @@ oxr_xrResultToString(XrInstance instance, XrResult value, char buffer[XR_MAX_RES
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrStructureTypeToString(XrInstance instance, XrStructureType value, char buffer[XR_MAX_STRUCTURE_NAME_SIZE])
 {
 	OXR_TRACE_MARKER();
@@ -288,7 +288,7 @@ oxr_xrStructureTypeToString(XrInstance instance, XrStructureType value, char buf
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrStringToPath(XrInstance instance, const char *pathString, XrPath *out_path)
 {
 	OXR_TRACE_MARKER();
@@ -314,7 +314,7 @@ oxr_xrStringToPath(XrInstance instance, const char *pathString, XrPath *out_path
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrPathToString(
     XrInstance instance, XrPath path, uint32_t bufferCapacityInput, uint32_t *bufferCountOutput, char *buffer)
 {
@@ -346,7 +346,7 @@ oxr_xrPathToString(
 
 // ---- XR_KHR_convert_timespec_time extension
 #ifdef OXR_HAVE_KHR_convert_timespec_time
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *timespecTime, XrTime *time)
 {
 	OXR_TRACE_MARKER();
@@ -362,7 +362,7 @@ oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *t
 	return oxr_instance_convert_timespec_to_time(&log, inst, timespecTime, time);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrConvertTimeToTimespecTimeKHR(XrInstance instance, XrTime time, struct timespec *timespecTime)
 {
 	OXR_TRACE_MARKER();
@@ -384,7 +384,7 @@ oxr_xrConvertTimeToTimespecTimeKHR(XrInstance instance, XrTime time, struct time
 
 // ---- XR_KHR_win32_convert_performance_counter_time extension
 #ifdef XR_USE_PLATFORM_WIN32
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrConvertWin32PerformanceCounterToTimeKHR(XrInstance instance,
                                               const LARGE_INTEGER *performanceCounter,
                                               XrTime *time)
@@ -402,7 +402,7 @@ oxr_xrConvertWin32PerformanceCounterToTimeKHR(XrInstance instance,
 	return oxr_instance_convert_win32perfcounter_to_time(&log, inst, performanceCounter, time);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrConvertTimeToWin32PerformanceCounterKHR(XrInstance instance, XrTime time, LARGE_INTEGER *performanceCounter)
 {
 	OXR_TRACE_MARKER();

src/xrt/state_trackers/oxr/oxr_api_negotiate.c

@@ -84,7 +84,7 @@ xrNegotiateLoaderRuntimeInterface(const XrNegotiateLoaderInfo *loaderInfo, XrNeg
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateApiLayerProperties(uint32_t propertyCapacityInput,
                                   uint32_t *propertyCountOutput,
                                   XrApiLayerProperties *properties)
@@ -311,7 +311,7 @@ handle_null(struct oxr_logger *log, const char *name, PFN_xrVoidFunction *out_fu
 	return oxr_error(log, XR_ERROR_FUNCTION_UNSUPPORTED, "(name = \"%s\")", name);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetInstanceProcAddr(XrInstance instance, const char *name, PFN_xrVoidFunction *function)
 {
 	struct oxr_logger log;

src/xrt/state_trackers/oxr/oxr_api_session.c

@@ -27,7 +27,7 @@
 #include "oxr_chain.h"
 
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateSession(XrInstance instance, const XrSessionCreateInfo *createInfo, XrSession *out_session)
 {
 	OXR_TRACE_MARKER();
@@ -61,7 +61,7 @@ oxr_xrCreateSession(XrInstance instance, const XrSessionCreateInfo *createInfo,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroySession(XrSession session)
 {
 	OXR_TRACE_MARKER();
@@ -83,7 +83,7 @@ oxr_xrDestroySession(XrSession session)
 	return oxr_handle_destroy(&log, &sess->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrBeginSession(XrSession session, const XrSessionBeginInfo *beginInfo)
 {
 	OXR_TRACE_MARKER();
@@ -97,7 +97,7 @@ oxr_xrBeginSession(XrSession session, const XrSessionBeginInfo *beginInfo)
 	return oxr_session_begin(&log, sess, beginInfo);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEndSession(XrSession session)
 {
 	OXR_TRACE_MARKER();
@@ -109,7 +109,7 @@ oxr_xrEndSession(XrSession session)
 	return oxr_session_end(&log, sess);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrWaitFrame(XrSession session, const XrFrameWaitInfo *frameWaitInfo, XrFrameState *frameState)
 {
 	OXR_TRACE_MARKER();
@@ -124,7 +124,7 @@ oxr_xrWaitFrame(XrSession session, const XrFrameWaitInfo *frameWaitInfo, XrFrame
 	return oxr_session_frame_wait(&log, sess, frameState);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
 {
 	OXR_TRACE_MARKER();
@@ -146,7 +146,7 @@ oxr_xrBeginFrame(XrSession session, const XrFrameBeginInfo *frameBeginInfo)
 	return res;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEndFrame(XrSession session, const XrFrameEndInfo *frameEndInfo)
 {
 	OXR_TRACE_MARKER();
@@ -167,7 +167,7 @@ oxr_xrEndFrame(XrSession session, const XrFrameEndInfo *frameEndInfo)
 	return res;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrRequestExitSession(XrSession session)
 {
 	OXR_TRACE_MARKER();
@@ -179,7 +179,7 @@ oxr_xrRequestExitSession(XrSession session)
 	return oxr_session_request_exit(&log, sess);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrLocateViews(XrSession session,
                   const XrViewLocateInfo *viewLocateInfo,
                   XrViewState *viewState,
@@ -235,7 +235,7 @@ oxr_xrLocateViews(XrSession session,
 
 #ifdef XR_KHR_visibility_mask
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVisibilityMaskKHR(XrSession session,
                            XrViewConfigurationType viewConfigurationType,
                            uint32_t viewIndex,
@@ -262,7 +262,7 @@ oxr_xrGetVisibilityMaskKHR(XrSession session,
 
 #ifdef XR_EXT_performance_settings
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrPerfSettingsSetPerformanceLevelEXT(XrSession session,
                                          XrPerfSettingsDomainEXT domain,
                                          XrPerfSettingsLevelEXT level)
@@ -287,7 +287,7 @@ oxr_xrPerfSettingsSetPerformanceLevelEXT(XrSession session,
 
 #ifdef XR_EXT_thermal_query
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrThermalGetTemperatureTrendEXT(XrSession session,
                                     XrPerfSettingsDomainEXT domain,
                                     XrPerfSettingsNotificationLevelEXT *notificationLevel,
@@ -375,7 +375,7 @@ oxr_hand_tracker_create(struct oxr_logger *log,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateHandTrackerEXT(XrSession session,
                            const XrHandTrackerCreateInfoEXT *createInfo,
                            XrHandTrackerEXT *handTracker)
@@ -406,7 +406,7 @@ oxr_xrCreateHandTrackerEXT(XrSession session,
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroyHandTrackerEXT(XrHandTrackerEXT handTracker)
 {
 	OXR_TRACE_MARKER();
@@ -418,7 +418,7 @@ oxr_xrDestroyHandTrackerEXT(XrHandTrackerEXT handTracker)
 	return oxr_handle_destroy(&log, &hand_tracker->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrLocateHandJointsEXT(XrHandTrackerEXT handTracker,
                           const XrHandJointsLocateInfoEXT *locateInfo,
                           XrHandJointLocationsEXT *locations)
@@ -479,7 +479,7 @@ oxr_xrLocateHandJointsEXT(XrHandTrackerEXT handTracker,
 
 #ifdef XR_MNDX_force_feedback_curl
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrForceFeedbackCurlApplyLocationsMNDX *locations)
 {
 	OXR_TRACE_MARKER();
@@ -502,7 +502,7 @@ oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrForceFeed
 
 #ifdef XR_FB_display_refresh_rate
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateDisplayRefreshRatesFB(XrSession session,
                                      uint32_t displayRefreshRateCapacityInput,
                                      uint32_t *displayRefreshRateCountOutput,
@@ -522,7 +522,7 @@ oxr_xrEnumerateDisplayRefreshRatesFB(XrSession session,
 	                    sess->sys->xsysc->info.num_refresh_rates, sess->sys->xsysc->info.refresh_rates, XR_SUCCESS);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetDisplayRefreshRateFB(XrSession session, float *displayRefreshRate)
 {
 	struct oxr_session *sess = NULL;
@@ -544,7 +544,7 @@ oxr_xrGetDisplayRefreshRateFB(XrSession session, float *displayRefreshRate)
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrRequestDisplayRefreshRateFB(XrSession session, float displayRefreshRate)
 {
 	struct oxr_session *sess = NULL;

src/xrt/state_trackers/oxr/oxr_api_space.c

@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateActionSpace(XrSession session, const XrActionSpaceCreateInfo *createInfo, XrSpace *space)
 {
 	OXR_TRACE_MARKER();
@@ -57,7 +57,7 @@ static const XrReferenceSpaceType session_spaces[] = {
     XR_REFERENCE_SPACE_TYPE_STAGE,
 };
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateReferenceSpaces(XrSession session,
                                uint32_t spaceCapacityInput,
                                uint32_t *spaceCountOutput,
@@ -73,7 +73,7 @@ oxr_xrEnumerateReferenceSpaces(XrSession session,
 	                    session_spaces, oxr_session_success_result(sess));
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetReferenceSpaceBoundsRect(XrSession session, XrReferenceSpaceType referenceSpaceType, XrExtent2Df *bounds)
 {
 	OXR_TRACE_MARKER();
@@ -102,7 +102,7 @@ oxr_xrGetReferenceSpaceBoundsRect(XrSession session, XrReferenceSpaceType refere
 	return XR_SPACE_BOUNDS_UNAVAILABLE;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateReferenceSpace(XrSession session, const XrReferenceSpaceCreateInfo *createInfo, XrSpace *out_space)
 {
 	OXR_TRACE_MARKER();
@@ -125,7 +125,7 @@ oxr_xrCreateReferenceSpace(XrSession session, const XrReferenceSpaceCreateInfo *
 	return oxr_session_success_result(sess);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrLocateSpace(XrSpace space, XrSpace baseSpace, XrTime time, XrSpaceLocation *location)
 {
 	OXR_TRACE_MARKER();
@@ -146,7 +146,7 @@ oxr_xrLocateSpace(XrSpace space, XrSpace baseSpace, XrTime time, XrSpaceLocation
 	return oxr_space_locate(&log, spc, baseSpc, time, location);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroySpace(XrSpace space)
 {
 	OXR_TRACE_MARKER();

src/xrt/state_trackers/oxr/oxr_api_swapchain.c

@@ -25,7 +25,7 @@
 #include <inttypes.h>
 
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateSwapchainFormats(XrSession session,
                                 uint32_t formatCapacityInput,
                                 uint32_t *formatCountOutput,
@@ -40,7 +40,7 @@ oxr_xrEnumerateSwapchainFormats(XrSession session,
 	return oxr_session_enumerate_formats(&log, sess, formatCapacityInput, formatCountOutput, formats);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo, XrSwapchain *out_swapchain)
 {
 	OXR_TRACE_MARKER();
@@ -111,7 +111,7 @@ oxr_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo
 	return oxr_session_success_result(sess);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrDestroySwapchain(XrSwapchain swapchain)
 {
 	OXR_TRACE_MARKER();
@@ -123,7 +123,7 @@ oxr_xrDestroySwapchain(XrSwapchain swapchain)
 	return oxr_handle_destroy(&log, &sc->handle);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateSwapchainImages(XrSwapchain swapchain,
                                uint32_t imageCapacityInput,
                                uint32_t *imageCountOutput,
@@ -149,7 +149,7 @@ oxr_xrEnumerateSwapchainImages(XrSwapchain swapchain,
 	return sc->enumerate_images(&log, sc, xsc->image_count, images);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrAcquireSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageAcquireInfo *acquireInfo, uint32_t *index)
 {
 	OXR_TRACE_MARKER();
@@ -163,7 +163,7 @@ oxr_xrAcquireSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageAcquire
 	return sc->acquire_image(&log, sc, acquireInfo, index);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrWaitSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageWaitInfo *waitInfo)
 {
 	OXR_TRACE_MARKER();
@@ -176,7 +176,7 @@ oxr_xrWaitSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageWaitInfo *
 	return sc->wait_image(&log, sc, waitInfo);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrReleaseSwapchainImage(XrSwapchain swapchain, const XrSwapchainImageReleaseInfo *releaseInfo)
 {
 	OXR_TRACE_MARKER();

src/xrt/state_trackers/oxr/oxr_api_system.c

@@ -40,7 +40,7 @@
 		assert(system != NULL);                                                                                \
 	} while (false)
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetSystem(XrInstance instance, const XrSystemGetInfo *getInfo, XrSystemId *systemId)
 {
 	OXR_TRACE_MARKER();
@@ -65,7 +65,7 @@ oxr_xrGetSystem(XrInstance instance, const XrSystemGetInfo *getInfo, XrSystemId
 	return XR_SUCCESS;
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetSystemProperties(XrInstance instance, XrSystemId systemId, XrSystemProperties *properties)
 {
 	OXR_TRACE_MARKER();
@@ -79,7 +79,7 @@ oxr_xrGetSystemProperties(XrInstance instance, XrSystemId systemId, XrSystemProp
 	return oxr_system_get_properties(&log, sys, properties);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateViewConfigurations(XrInstance instance,
                                   XrSystemId systemId,
                                   uint32_t viewConfigurationTypeCapacityInput,
@@ -97,7 +97,7 @@ oxr_xrEnumerateViewConfigurations(XrInstance instance,
 	                                       viewConfigurationTypeCountOutput, viewConfigurationTypes);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateEnvironmentBlendModes(XrInstance instance,
                                      XrSystemId systemId,
                                      XrViewConfigurationType viewConfigurationType,
@@ -124,7 +124,7 @@ oxr_xrEnumerateEnvironmentBlendModes(XrInstance instance,
 	                                        environmentBlendModeCountOutput, environmentBlendModes);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetViewConfigurationProperties(XrInstance instance,
                                      XrSystemId systemId,
                                      XrViewConfigurationType viewConfigurationType,
@@ -141,7 +141,7 @@ oxr_xrGetViewConfigurationProperties(XrInstance instance,
 	return oxr_system_get_view_conf_properties(&log, sys, viewConfigurationType, configurationProperties);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrEnumerateViewConfigurationViews(XrInstance instance,
                                       XrSystemId systemId,
                                       XrViewConfigurationType viewConfigurationType,
@@ -169,7 +169,7 @@ oxr_xrEnumerateViewConfigurationViews(XrInstance instance,
 
 #ifdef XR_USE_GRAPHICS_API_OPENGL_ES
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetOpenGLESGraphicsRequirementsKHR(XrInstance instance,
                                          XrSystemId systemId,
                                          XrGraphicsRequirementsOpenGLESKHR *graphicsRequirements)
@@ -205,7 +205,7 @@ oxr_xrGetOpenGLESGraphicsRequirementsKHR(XrInstance instance,
 
 #ifdef XR_USE_GRAPHICS_API_OPENGL
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetOpenGLGraphicsRequirementsKHR(XrInstance instance,
                                        XrSystemId systemId,
                                        XrGraphicsRequirementsOpenGLKHR *graphicsRequirements)
@@ -241,7 +241,7 @@ oxr_xrGetOpenGLGraphicsRequirementsKHR(XrInstance instance,
 
 #ifdef XR_USE_GRAPHICS_API_VULKAN
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanInstanceExtensionsKHR(XrInstance instance,
                                      XrSystemId systemId,
                                      uint32_t namesCapacityInput,
@@ -258,7 +258,7 @@ oxr_xrGetVulkanInstanceExtensionsKHR(XrInstance instance,
 	return oxr_vk_get_instance_exts(&log, sys, namesCapacityInput, namesCountOutput, namesString);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanDeviceExtensionsKHR(XrInstance instance,
                                    XrSystemId systemId,
                                    uint32_t namesCapacityInput,
@@ -279,7 +279,7 @@ oxr_xrGetVulkanDeviceExtensionsKHR(XrInstance instance,
 VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
 vkGetInstanceProcAddr(VkInstance instance, const char *pName);
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanGraphicsDeviceKHR(XrInstance instance,
                                  XrSystemId systemId,
                                  VkInstance vkInstance,
@@ -296,7 +296,7 @@ oxr_xrGetVulkanGraphicsDeviceKHR(XrInstance instance,
 	return oxr_vk_get_physical_device(&log, inst, sys, vkInstance, vkGetInstanceProcAddr, vkPhysicalDevice);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanGraphicsDevice2KHR(XrInstance instance,
                                   const XrVulkanGraphicsDeviceGetInfoKHR *getInfo,
                                   VkPhysicalDevice *vkPhysicalDevice)
@@ -315,7 +315,7 @@ oxr_xrGetVulkanGraphicsDevice2KHR(XrInstance instance,
 	                                  vkPhysicalDevice);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanGraphicsRequirementsKHR(XrInstance instance,
                                        XrSystemId systemId,
                                        XrGraphicsRequirementsVulkanKHR *graphicsRequirements)
@@ -331,7 +331,7 @@ oxr_xrGetVulkanGraphicsRequirementsKHR(XrInstance instance,
 	return oxr_vk_get_requirements(&log, sys, graphicsRequirements);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetVulkanGraphicsRequirements2KHR(XrInstance instance,
                                         XrSystemId systemId,
                                         XrGraphicsRequirementsVulkan2KHR *graphicsRequirements)
@@ -380,7 +380,7 @@ oxr_xrCreateVulkanInstanceKHR(XrInstance instance,
 	return oxr_vk_create_vulkan_instance(&log, sys, createInfo, vulkanInstance, vulkanResult);
 }
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrCreateVulkanDeviceKHR(XrInstance instance,
                             const XrVulkanDeviceCreateInfoKHR *createInfo,
                             VkDevice *vulkanDevice,
@@ -427,7 +427,7 @@ oxr_xrCreateVulkanDeviceKHR(XrInstance instance,
 
 #ifdef XR_USE_GRAPHICS_API_D3D11
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetD3D11GraphicsRequirementsKHR(XrInstance instance,
                                       XrSystemId systemId,
                                       XrGraphicsRequirementsD3D11KHR *graphicsRequirements)
@@ -454,7 +454,7 @@ oxr_xrGetD3D11GraphicsRequirementsKHR(XrInstance instance,
 
 #ifdef XR_USE_GRAPHICS_API_D3D12
 
-XrResult
+XRAPI_ATTR XrResult XRAPI_CALL
 oxr_xrGetD3D12GraphicsRequirementsKHR(XrInstance instance,
                                       XrSystemId systemId,
                                       XrGraphicsRequirementsD3D12KHR *graphicsRequirements)