The open source OpenXR runtime

st/oxr: Fix up Monado experimental extensions

authored by

Korcan Hussein and committed by
Jakob Bornecrantz
a8c5be8f 230c059d

+72 -3
+1
scripts/generate_oxr_ext_support.py
··· 65 65 ['XR_MNDX_ball_on_a_stick_controller'], 66 66 ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'], 67 67 ['XR_MNDX_force_feedback_curl'], 68 + ['XR_MNDX_hydra'], 68 69 ) 69 70 70 71
+26
src/external/openxr_includes/openxr/XR_MNDX_ball_on_a_stick_controller.h
··· 1 + // Copyright 2023, Collabora, Ltd. 2 + // SPDX-License-Identifier: BSL-1.0 3 + /*! 4 + * @file 5 + * @brief Preview header for XR_MNDX_ball_on_a_stick_controller extension 6 + * @author Korcan Hussein <korcan.hussein@collabora.com> 7 + * @ingroup external_openxr 8 + */ 9 + #ifndef XR_MNDX_BALL_ON_A_STICK_CONTROLLER_H 10 + #define XR_MNDX_BALL_ON_A_STICK_CONTROLLER_H 1 11 + 12 + #include <openxr/openxr.h> 13 + 14 + #ifdef __cplusplus 15 + extern "C" { 16 + #endif 17 + 18 + #define XR_MNDX_ball_on_a_stick_controller 1 19 + #define XR_MNDX_ball_on_a_stick_controller_SPEC_VERSION 1 20 + #define XR_MNDX_BALL_ON_A_STICK_CONTROLLER_EXTENSION_NAME "XR_MNDX_ball_on_a_stick_controller" 21 + 22 + #ifdef __cplusplus 23 + } 24 + #endif 25 + 26 + #endif
+26
src/external/openxr_includes/openxr/XR_MNDX_hydra.h
··· 1 + // Copyright 2023, Collabora, Ltd. 2 + // SPDX-License-Identifier: BSL-1.0 3 + /*! 4 + * @file 5 + * @brief Preview header for XR_MNDX_hydra extension 6 + * @author Korcan Hussein <korcan.hussein@collabora.com> 7 + * @ingroup external_openxr 8 + */ 9 + #ifndef XR_MNDX_HYDRA_H 10 + #define XR_MNDX_HYDRA_H 1 11 + 12 + #include <openxr/openxr.h> 13 + 14 + #ifdef __cplusplus 15 + extern "C" { 16 + #endif 17 + 18 + #define XR_MNDX_hydra 1 19 + #define XR_MNDX_hydra_SPEC_VERSION 1 20 + #define XR_MNDX_HYDRA_EXTENSION_NAME "XR_MNDX_hydra" 21 + 22 + #ifdef __cplusplus 23 + } 24 + #endif 25 + 26 + #endif
+5 -1
src/xrt/include/xrt/xrt_openxr_includes.h
··· 1 - // Copyright 2018-2022, Collabora, Ltd. 1 + // Copyright 2018-2023, Collabora, Ltd. 2 2 // SPDX-License-Identifier: BSL-1.0 3 3 /*! 4 4 * @file 5 5 * @brief Include all of the openxr headers in one place. 6 6 * @author Jakob Bornecrantz <jakob@collabora.com> 7 + * @author Korcan Hussein <korcan.hussein@collabora.com> 7 8 * @ingroup xrt_iface 8 9 */ 9 10 ··· 48 49 #include "openxr/openxr.h" 49 50 #include "openxr/openxr_platform.h" 50 51 #include "openxr/loader_interfaces.h" 52 + 53 + #include "openxr/XR_MNDX_hydra.h" 54 + #include "openxr/XR_MNDX_ball_on_a_stick_controller.h"
+14 -2
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 1 - // Copyright 2019-2022, Collabora, Ltd. 1 + // Copyright 2019-2023, Collabora, Ltd. 2 2 // SPDX-License-Identifier: BSL-1.0 3 3 /*! 4 4 * @file ··· 382 382 #define OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) 383 383 #endif 384 384 385 + 386 + /* 387 + * XR_MNDX_hydra 388 + */ 389 + #if defined(XR_MNDX_hydra) 390 + #define OXR_HAVE_MNDX_hydra 391 + #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_) _(MNDX_hydra, MNDX_HYDRA) 392 + #else 393 + #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_) 394 + #endif 395 + 385 396 // end of GENERATED per-extension defines - do not modify - used by scripts 386 397 387 398 /*! ··· 437 448 OXR_EXTENSION_SUPPORT_EXTX_overlay(_) \ 438 449 OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \ 439 450 OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \ 440 - OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) 451 + OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \ 452 + OXR_EXTENSION_SUPPORT_MNDX_hydra(_) 441 453 // clang-format on