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

Configure Feed

Select the types of activity you want to include in your feed.

st/oxr: Make misc extensions a build time option

Jakob Bornecrantz 33498dc6 b7299ead

+37 -10
+22
CMakeLists.txt
··· 362 362 # Most users won't touch these. 363 363 mark_as_advanced(XRT_MODULE_COMPOSITOR_MAIN XRT_MODULE_COMPOSITOR_NULL XRT_FEATURE_OPENXR) 364 364 365 + # Misc extension support. 366 + if(NOT DEFINED XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE) 367 + set(XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE ON) 368 + endif() 369 + if(NOT DEFINED XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL) 370 + set(XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL ON) 371 + endif() 372 + if(NOT DEFINED XRT_FEATURE_OPENXR_HEADLESS) 373 + set(XRT_FEATURE_OPENXR_HEADLESS ON) 374 + endif() 375 + if(NOT DEFINED XRT_FEATURE_OPENXR_OVERLAY) 376 + set(XRT_FEATURE_OPENXR_OVERLAY ON) 377 + endif() 378 + if(NOT DEFINED XRT_FEATURE_OPENXR_VISIBILITY_MASK) 379 + set(XRT_FEATURE_OPENXR_VISIBILITY_MASK ON) 380 + endif() 381 + 365 382 # Interaction extension support. 366 383 if(NOT DEFINED XRT_FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE) 367 384 set(XRT_FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE ON) ··· 598 615 message(STATUS "# FEATURE_DEBUG_GUI: ${XRT_FEATURE_DEBUG_GUI}") 599 616 message(STATUS "# FEATURE_OPENXR: ${XRT_FEATURE_OPENXR}") 600 617 message(STATUS "# FEATURE_OPENXR_DEBUG_UTILS: ${XRT_FEATURE_OPENXR_DEBUG_UTILS}") 618 + message(STATUS "# FEATURE_OPENXR_DISPLAY_REFRESH_RATE: ${XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE}") 619 + message(STATUS "# FEATURE_OPENXR_FORCE_FEEDBACK_CURL: ${XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL}") 620 + message(STATUS "# FEATURE_OPENXR_HEADLESS: ${XRT_FEATURE_OPENXR_HEADLESS}") 601 621 message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE}") 602 622 message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_HAND: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_HAND}") 603 623 message(STATUS "# FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE: ${XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE}") ··· 611 631 message(STATUS "# FEATURE_OPENXR_LAYER_DEPTH: ${XRT_FEATURE_OPENXR_LAYER_DEPTH}") 612 632 message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT1: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT1}") 613 633 message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT2: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT2}") 634 + message(STATUS "# FEATURE_OPENXR_OVERLAY: ${XRT_FEATURE_OPENXR_OVERLAY}") 614 635 message(STATUS "# FEATURE_OPENXR_SPACE_LOCAL_FLOOR: ${XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR}") 615 636 message(STATUS "# FEATURE_OPENXR_SPACE_UNBOUNDED: ${XRT_FEATURE_OPENXR_SPACE_UNBOUNDED}") 637 + message(STATUS "# FEATURE_OPENXR_VISIBILITY_MASK ${XRT_FEATURE_OPENXR_VISIBILITY_MASK}") 616 638 message(STATUS "# FEATURE_RENDERDOC: ${XRT_FEATURE_RENDERDOC}") 617 639 message(STATUS "# FEATURE_SERVICE: ${XRT_FEATURE_SERVICE}") 618 640 message(STATUS "# FEATURE_SERVICE_SYSTEMD: ${XRT_FEATURE_SERVICE_SYSTEMD}")
+5 -5
scripts/generate_oxr_ext_support.py
··· 49 49 ['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'], 50 50 ['XR_KHR_opengl_es_enable', 'XR_USE_GRAPHICS_API_OPENGL_ES'], 51 51 ['XR_KHR_swapchain_usage_input_attachment_bit'], 52 - ['XR_KHR_visibility_mask'], 52 + ['XR_KHR_visibility_mask', 'XRT_FEATURE_OPENXR_VISIBILITY_MASK'], 53 53 ['XR_KHR_vulkan_enable', 'XR_USE_GRAPHICS_API_VULKAN'], 54 54 ['XR_KHR_vulkan_enable2', 'XR_USE_GRAPHICS_API_VULKAN'], 55 55 ['XR_KHR_win32_convert_performance_counter_time', 'XR_USE_PLATFORM_WIN32'], ··· 62 62 ['XR_EXT_local_floor', 'XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR'], 63 63 ['XR_EXT_palm_pose', 'XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE'], 64 64 ['XR_EXT_samsung_odyssey_controller', 'XRT_FEATURE_OPENXR_INTERACTION_WINMR'], 65 - ['XR_FB_display_refresh_rate'], 65 + ['XR_FB_display_refresh_rate', 'XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE'], 66 66 ['XR_ML_ml2_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_ML2'], 67 - ['XR_MND_headless'], 67 + ['XR_MND_headless', 'XRT_FEATURE_OPENXR_HEADLESS'], 68 68 ['XR_MND_swapchain_usage_input_attachment_bit'], 69 69 ['XR_MSFT_hand_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_MSFT_HAND'], 70 70 ['XR_MSFT_unbounded_reference_space', 'XRT_FEATURE_OPENXR_SPACE_UNBOUNDED'], 71 71 ['XR_OPPO_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_OPPO'], 72 - ['XR_EXTX_overlay'], 72 + ['XR_EXTX_overlay', 'XRT_FEATURE_OPENXR_OVERLAY'], 73 73 ['XR_HTCX_vive_tracker_interaction', 'ALWAYS_DISABLED'], 74 74 ['XR_MNDX_ball_on_a_stick_controller', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 75 75 ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'], 76 - ['XR_MNDX_force_feedback_curl'], 76 + ['XR_MNDX_force_feedback_curl', 'XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL'], 77 77 ['XR_MNDX_hydra', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 78 78 ['XR_MNDX_system_buttons', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 79 79 )
+5
src/xrt/include/xrt/xrt_config_build.h.cmake_in
··· 29 29 #cmakedefine XRT_FEATURE_DEBUG_GUI 30 30 #cmakedefine XRT_FEATURE_OPENXR 31 31 #cmakedefine XRT_FEATURE_OPENXR_DEBUG_UTILS 32 + #cmakedefine XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE 33 + #cmakedefine XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL 34 + #cmakedefine XRT_FEATURE_OPENXR_HEADLESS 32 35 #cmakedefine XRT_FEATURE_OPENXR_INTERACTION_EXT_EYE_GAZE 33 36 #cmakedefine XRT_FEATURE_OPENXR_INTERACTION_EXT_HAND 34 37 #cmakedefine XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE ··· 42 45 #cmakedefine XRT_FEATURE_OPENXR_LAYER_DEPTH 43 46 #cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT1 44 47 #cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT2 48 + #cmakedefine XRT_FEATURE_OPENXR_OVERLAY 45 49 #cmakedefine XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR 46 50 #cmakedefine XRT_FEATURE_OPENXR_SPACE_UNBOUNDED 51 + #cmakedefine XRT_FEATURE_OPENXR_VISIBILITY_MASK 47 52 #cmakedefine XRT_FEATURE_RENDERDOC 48 53 #cmakedefine XRT_FEATURE_SERVICE 49 54 #cmakedefine XRT_FEATURE_SERVICE_SYSTEMD
+5 -5
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 204 204 /* 205 205 * XR_KHR_visibility_mask 206 206 */ 207 - #if defined(XR_KHR_visibility_mask) 207 + #if defined(XR_KHR_visibility_mask) && defined(XRT_FEATURE_OPENXR_VISIBILITY_MASK) 208 208 #define OXR_HAVE_KHR_visibility_mask 209 209 #define OXR_EXTENSION_SUPPORT_KHR_visibility_mask(_) _(KHR_visibility_mask, KHR_VISIBILITY_MASK) 210 210 #else ··· 350 350 /* 351 351 * XR_FB_display_refresh_rate 352 352 */ 353 - #if defined(XR_FB_display_refresh_rate) 353 + #if defined(XR_FB_display_refresh_rate) && defined(XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE) 354 354 #define OXR_HAVE_FB_display_refresh_rate 355 355 #define OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_) _(FB_display_refresh_rate, FB_DISPLAY_REFRESH_RATE) 356 356 #else ··· 373 373 /* 374 374 * XR_MND_headless 375 375 */ 376 - #if defined(XR_MND_headless) 376 + #if defined(XR_MND_headless) && defined(XRT_FEATURE_OPENXR_HEADLESS) 377 377 #define OXR_HAVE_MND_headless 378 378 #define OXR_EXTENSION_SUPPORT_MND_headless(_) _(MND_headless, MND_HEADLESS) 379 379 #else ··· 430 430 /* 431 431 * XR_EXTX_overlay 432 432 */ 433 - #if defined(XR_EXTX_overlay) 433 + #if defined(XR_EXTX_overlay) && defined(XRT_FEATURE_OPENXR_OVERLAY) 434 434 #define OXR_HAVE_EXTX_overlay 435 435 #define OXR_EXTENSION_SUPPORT_EXTX_overlay(_) _(EXTX_overlay, EXTX_OVERLAY) 436 436 #else ··· 476 476 /* 477 477 * XR_MNDX_force_feedback_curl 478 478 */ 479 - #if defined(XR_MNDX_force_feedback_curl) 479 + #if defined(XR_MNDX_force_feedback_curl) && defined(XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL) 480 480 #define OXR_HAVE_MNDX_force_feedback_curl 481 481 #define OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) _(MNDX_force_feedback_curl, MNDX_FORCE_FEEDBACK_CURL) 482 482 #else