mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 04:36:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ext/openxr: Update XR_MNDX_force_feedback_curl

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-11-26 14:24:35 +00:00
parent b9603723cc
commit 69238be306
6 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/external/openxr_includes/openxr/openxr.h vendored
View file

@ -450,8 +450,8 @@ typedef enum XrStructureType {
XR_TYPE_VULKAN_SWAPCHAIN_CREATE_INFO_META = 1000227000,
XR_TYPE_PERFORMANCE_METRICS_STATE_META = 1000232001,
XR_TYPE_PERFORMANCE_METRICS_COUNTER_META = 1000232002,
XR_TYPE_SYSTEM_FORCE_FEEDBACK_CURL_PROPERTIES_MNDX = 1000375002,
XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX = 1000375003,
XR_TYPE_SYSTEM_FORCE_FEEDBACK_CURL_PROPERTIES_MNDX = 1000375000,
XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX = 1000375001,
XR_TYPE_GRAPHICS_BINDING_VULKAN2_KHR = XR_TYPE_GRAPHICS_BINDING_VULKAN_KHR,
XR_TYPE_SWAPCHAIN_IMAGE_VULKAN2_KHR = XR_TYPE_SWAPCHAIN_IMAGE_VULKAN_KHR,
XR_TYPE_GRAPHICS_REQUIREMENTS_VULKAN2_KHR = XR_TYPE_GRAPHICS_REQUIREMENTS_VULKAN_KHR,
@ -4582,11 +4582,11 @@ XRAPI_ATTR XrResult XRAPI_CALL xrQueryPerformanceMetricsCounterMETA(
#define XR_MNDX_FORCE_FEEDBACK_CURL_EXTENSION_NAME "XR_MNDX_force_feedback_curl"
typedef enum XrForceFeedbackCurlLocationMNDX {
XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_THUMB_CURL_MNDX = 0,
XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_INDEX_CURL_MNDX = 1,
XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_MIDDLE_CURL_MNDX = 2,
XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_RING_CURL_MNDX = 3,
XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_LITTLE_CURL_MNDX = 4,
XR_FORCE_FEEDBACK_CURL_LOCATION_THUMB_CURL_MNDX = 0,
XR_FORCE_FEEDBACK_CURL_LOCATION_INDEX_CURL_MNDX = 1,
XR_FORCE_FEEDBACK_CURL_LOCATION_MIDDLE_CURL_MNDX = 2,
XR_FORCE_FEEDBACK_CURL_LOCATION_RING_CURL_MNDX = 3,
XR_FORCE_FEEDBACK_CURL_LOCATION_LITTLE_CURL_MNDX = 4,
XR_FORCE_FEEDBACK_CURL_LOCATION_MAX_ENUM_MNDX = 0x7FFFFFFF
} XrForceFeedbackCurlLocationMNDX;
// XrSystemForceFeedbackCurlPropertiesMNDX extends XrSystemProperties
@ -4596,25 +4596,25 @@ typedef struct XrSystemForceFeedbackCurlPropertiesMNDX {
XrBool32 supportsForceFeedbackCurl;
} XrSystemForceFeedbackCurlPropertiesMNDX;
typedef struct XrApplyForceFeedbackCurlLocationMNDX {
typedef struct XrForceFeedbackCurlApplyLocationMNDX {
XrForceFeedbackCurlLocationMNDX location;
float value;
} XrApplyForceFeedbackCurlLocationMNDX;
} XrForceFeedbackCurlApplyLocationMNDX;
typedef struct XrApplyForceFeedbackCurlLocationsMNDX {
typedef struct XrForceFeedbackCurlApplyLocationsMNDX {
XrStructureType type;
const void* XR_MAY_ALIAS next;
XrApplyForceFeedbackCurlLocationMNDX* locations;
XrForceFeedbackCurlApplyLocationMNDX* locations;
uint32_t locationCount;
} XrApplyForceFeedbackCurlLocationsMNDX;
} XrForceFeedbackCurlApplyLocationsMNDX;
typedef XrResult (XRAPI_PTR *PFN_xrApplyForceFeedbackCurlMNDX)(XrHandTrackerEXT handTracker, const XrApplyForceFeedbackCurlLocationsMNDX* locations);
typedef XrResult (XRAPI_PTR *PFN_xrApplyForceFeedbackCurlMNDX)(XrHandTrackerEXT handTracker, const XrForceFeedbackCurlApplyLocationsMNDX* locations);
#ifndef XR_NO_PROTOTYPES
#ifdef XR_EXTENSION_PROTOTYPES
XRAPI_ATTR XrResult XRAPI_CALL xrApplyForceFeedbackCurlMNDX(
XrHandTrackerEXT handTracker,
const XrApplyForceFeedbackCurlLocationsMNDX* locations);
const XrForceFeedbackCurlApplyLocationsMNDX* locations);
#endif /* XR_EXTENSION_PROTOTYPES */
#endif /* !XR_NO_PROTOTYPES */

20
src/external/openxr_includes/openxr/openxr_reflection.h vendored
View file

@ -351,8 +351,8 @@ XR_ENUM_STR(XrResult);
_(XR_TYPE_VULKAN_SWAPCHAIN_CREATE_INFO_META, 1000227000) \
_(XR_TYPE_PERFORMANCE_METRICS_STATE_META, 1000232001) \
_(XR_TYPE_PERFORMANCE_METRICS_COUNTER_META, 1000232002) \
_(XR_TYPE_SYSTEM_FORCE_FEEDBACK_CURL_PROPERTIES_MNDX, 1000375002) \
_(XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX, 1000375003) \
_(XR_TYPE_SYSTEM_FORCE_FEEDBACK_CURL_PROPERTIES_MNDX, 1000375000) \
_(XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX, 1000375001) \
_(XR_STRUCTURE_TYPE_MAX_ENUM, 0x7FFFFFFF)
#define XR_LIST_ENUM_XrFormFactor(_) \
@ -751,11 +751,11 @@ XR_ENUM_STR(XrResult);
_(XR_PERFORMANCE_METRICS_COUNTER_UNIT_MAX_ENUM_META, 0x7FFFFFFF)
#define XR_LIST_ENUM_XrForceFeedbackCurlLocationMNDX(_) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_THUMB_CURL_MNDX, 0) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_INDEX_CURL_MNDX, 1) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_MIDDLE_CURL_MNDX, 2) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_RING_CURL_MNDX, 3) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_FINGER_LITTLE_CURL_MNDX, 4) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_THUMB_CURL_MNDX, 0) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_INDEX_CURL_MNDX, 1) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_MIDDLE_CURL_MNDX, 2) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_RING_CURL_MNDX, 3) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_LITTLE_CURL_MNDX, 4) \
_(XR_FORCE_FEEDBACK_CURL_LOCATION_MAX_ENUM_MNDX, 0x7FFFFFFF)
#define XR_LIST_BITS_XrInstanceCreateFlags(_)
@ -2702,11 +2702,11 @@ XR_ENUM_STR(XrResult);
_(next) \
_(supportsForceFeedbackCurl) \
#define XR_LIST_STRUCT_XrApplyForceFeedbackCurlLocationMNDX(_) \
#define XR_LIST_STRUCT_XrForceFeedbackCurlApplyLocationMNDX(_) \
_(location) \
_(value) \
#define XR_LIST_STRUCT_XrApplyForceFeedbackCurlLocationsMNDX(_) \
#define XR_LIST_STRUCT_XrForceFeedbackCurlApplyLocationsMNDX(_) \
_(type) \
_(next) \
_(locations) \
@ -2915,7 +2915,7 @@ XR_ENUM_STR(XrResult);
_(XrPerformanceMetricsStateMETA, XR_TYPE_PERFORMANCE_METRICS_STATE_META) \
_(XrPerformanceMetricsCounterMETA, XR_TYPE_PERFORMANCE_METRICS_COUNTER_META) \
_(XrSystemForceFeedbackCurlPropertiesMNDX, XR_TYPE_SYSTEM_FORCE_FEEDBACK_CURL_PROPERTIES_MNDX) \
_(XrApplyForceFeedbackCurlLocationsMNDX, XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX) \
_(XrForceFeedbackCurlApplyLocationsMNDX, XR_TYPE_FORCE_FEEDBACK_CURL_APPLY_LOCATIONS_MNDX) \

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

@ -546,7 +546,7 @@ oxr_xrLocateHandJointsEXT(XrHandTrackerEXT handTracker,
//! OpenXR API function @ep{xrApplyForceFeedbackCurlMNDX}
XRAPI_ATTR XrResult XRAPI_CALL
oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrApplyForceFeedbackCurlLocationsMNDX *locations);
oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrForceFeedbackCurlApplyLocationsMNDX *locations);
//! OpenXR API function @ep{xrEnumerateDisplayRefreshRatesFB}

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

@ -480,7 +480,7 @@ oxr_xrLocateHandJointsEXT(XrHandTrackerEXT handTracker,
#ifdef XR_MNDX_force_feedback_curl
XrResult
oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrApplyForceFeedbackCurlLocationsMNDX *locations)
oxr_xrApplyForceFeedbackCurlMNDX(XrHandTrackerEXT handTracker, const XrForceFeedbackCurlApplyLocationsMNDX *locations)
{
OXR_TRACE_MARKER();

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

@ -796,7 +796,7 @@ oxr_session_hand_joints(struct oxr_logger *log,
XrResult
oxr_session_apply_force_feedback(struct oxr_logger *log,
struct oxr_hand_tracker *hand_tracker,
const XrApplyForceFeedbackCurlLocationsMNDX *locations);
const XrForceFeedbackCurlApplyLocationsMNDX *locations);
/*
*

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

@ -1022,7 +1022,7 @@ xr_hand_to_force_feedback_output(XrHandEXT hand)
XrResult
oxr_session_apply_force_feedback(struct oxr_logger *log,
struct oxr_hand_tracker *hand_tracker,
const XrApplyForceFeedbackCurlLocationsMNDX *locations)
const XrForceFeedbackCurlApplyLocationsMNDX *locations)
{
struct xrt_device *xdev = hand_tracker->xdev;