matrixfurry.com / monado
The open source OpenXR runtime
fork atom

st/oxr: Sort extension list [NFC]

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2612>

authored by Jakob Bornecrantz and committed by Korcan Hussein 865ab61a 81b39e70

options
unified split
Changed files
+13 -13
scripts
generate_oxr_ext_support.py
src
xrt
state_trackers
oxr
oxr_extension_support.h
+1 -1
scripts/generate_oxr_ext_support.py
··· 105 105 ['XR_HTCX_vive_tracker_interaction', 'ALWAYS_DISABLED'], 106 106 ['XR_MNDX_ball_on_a_stick_controller', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 107 107 ['XR_MNDX_blubur_s1', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 108 - ['XR_MNDX_oculus_remote', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 109 108 ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL'], 110 109 ['XR_MNDX_force_feedback_curl', 'XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL'], 111 110 ['XR_MNDX_hydra', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 111 + ['XR_MNDX_oculus_remote', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 112 112 ['XR_MNDX_psvr2_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 113 113 ['XR_MNDX_system_buttons', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 114 114 ['XR_MNDX_xdev_space', 'XRT_FEATURE_OPENXR_XDEV_SPACE'],
+12 -12
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 797 797 798 798 799 799 /* 800 - * XR_MNDX_oculus_remote 801 - */ 802 - #if defined(XR_MNDX_oculus_remote) && defined(XRT_FEATURE_OPENXR_INTERACTION_MNDX) 803 - #define OXR_HAVE_MNDX_oculus_remote 804 - #define OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) _(MNDX_oculus_remote, MNDX_OCULUS_REMOTE) 805 - #else 806 - #define OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) 807 - #endif 808 - 809 - 810 - /* 811 800 * XR_MNDX_egl_enable 812 801 */ 813 802 #if defined(XR_MNDX_egl_enable) && defined(XR_USE_PLATFORM_EGL) ··· 837 826 #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_) _(MNDX_hydra, MNDX_HYDRA) 838 827 #else 839 828 #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_) 829 + #endif 830 + 831 + 832 + /* 833 + * XR_MNDX_oculus_remote 834 + */ 835 + #if defined(XR_MNDX_oculus_remote) && defined(XRT_FEATURE_OPENXR_INTERACTION_MNDX) 836 + #define OXR_HAVE_MNDX_oculus_remote 837 + #define OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) _(MNDX_oculus_remote, MNDX_OCULUS_REMOTE) 838 + #else 839 + #define OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) 840 840 #endif 841 841 842 842 ··· 964 964 OXR_EXTENSION_SUPPORT_HTCX_vive_tracker_interaction(_) \ 965 965 OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \ 966 966 OXR_EXTENSION_SUPPORT_MNDX_blubur_s1(_) \ 967 - OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) \ 968 967 OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \ 969 968 OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \ 970 969 OXR_EXTENSION_SUPPORT_MNDX_hydra(_) \ 970 + OXR_EXTENSION_SUPPORT_MNDX_oculus_remote(_) \ 971 971 OXR_EXTENSION_SUPPORT_MNDX_psvr2_interaction(_) \ 972 972 OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) \ 973 973 OXR_EXTENSION_SUPPORT_MNDX_xdev_space(_)