mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 02:26:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Add XR_MNDX_system_buttons support

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-07-15 13:04:54 +01:00
parent 314fc9c583
commit 0da57b30a4
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/generate_oxr_ext_support.py
View file

@ -71,6 +71,7 @@ EXTENSIONS = (
['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'], ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'],
['XR_MNDX_force_feedback_curl'], ['XR_MNDX_force_feedback_curl'],
['XR_MNDX_hydra'], ['XR_MNDX_hydra'],
['XR_MNDX_system_buttons'],
) )

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

@ -351,6 +351,9 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
#endif #endif
.MNDX_ball_on_a_stick_controller = inst->extensions.MNDX_ball_on_a_stick_controller, .MNDX_ball_on_a_stick_controller = inst->extensions.MNDX_ball_on_a_stick_controller,
.MNDX_hydra = inst->extensions.MNDX_hydra, .MNDX_hydra = inst->extensions.MNDX_hydra,
#ifdef OXR_HAVE_MNDX_system_buttons
.MNDX_system_buttons = inst->extensions.MNDX_system_buttons,
#endif
.EXT_eye_gaze_interaction = inst->extensions.EXT_eye_gaze_interaction, .EXT_eye_gaze_interaction = inst->extensions.EXT_eye_gaze_interaction,
#ifdef OXR_HAVE_HTCX_vive_tracker_interaction #ifdef OXR_HAVE_HTCX_vive_tracker_interaction
.HTCX_vive_tracker_interaction = inst->extensions.HTCX_vive_tracker_interaction, .HTCX_vive_tracker_interaction = inst->extensions.HTCX_vive_tracker_interaction,

14
src/xrt/state_trackers/oxr/oxr_extension_support.h
View file

@ -449,6 +449,17 @@
#define OXR_EXTENSION_SUPPORT_MNDX_hydra(_) #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_)
#endif #endif
/*
* XR_MNDX_system_buttons
*/
#if defined(XR_MNDX_system_buttons)
#define OXR_HAVE_MNDX_system_buttons
#define OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) _(MNDX_system_buttons, MNDX_SYSTEM_BUTTONS)
#else
#define OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_)
#endif
// end of GENERATED per-extension defines - do not modify - used by scripts // end of GENERATED per-extension defines - do not modify - used by scripts
/*! /*!
@ -510,5 +521,6 @@
OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \ OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \
OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \ OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \
OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \ OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \
OXR_EXTENSION_SUPPORT_MNDX_hydra(_) OXR_EXTENSION_SUPPORT_MNDX_hydra(_) \
OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_)
// clang-format on // clang-format on