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: Unify FB extension define names

Jakob Bornecrantz 6bdfb155 c123c10a

+13 -13
+7 -7
CMakeLists.txt
··· 413 413 endif() 414 414 415 415 # Defaults for OpenXR layer support 416 - if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS) 417 - set(XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS OFF) 418 - endif() 419 416 if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_DEPTH) 420 417 set(XRT_FEATURE_OPENXR_LAYER_DEPTH ON) 421 418 endif() ··· 434 431 if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_EQUIRECT1) 435 432 set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT1 OFF) 436 433 endif() 437 - if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT) 438 - set(XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT ON) 434 + if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT) 435 + set(XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT ON) 436 + endif() 437 + if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS) 438 + set(XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS OFF) 439 439 endif() 440 440 441 441 # Defaults for OpenXR spaces ··· 649 649 message(STATUS "# FEATURE_OPENXR_LAYER_DEPTH: ${XRT_FEATURE_OPENXR_LAYER_DEPTH}") 650 650 message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT1: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT1}") 651 651 message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT2: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT2}") 652 - message(STATUS "# FEATURE_OPENXR_COMPOSITION_LAYER_SETTINGS: ${XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS}") 653 - message(STATUS "# FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT ${XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT}") 652 + message(STATUS "# FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT ${XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT}") 653 + message(STATUS "# FEATURE_OPENXR_LAYER_FB_SETTINGS: ${XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS}") 654 654 message(STATUS "# FEATURE_OPENXR_OVERLAY: ${XRT_FEATURE_OPENXR_OVERLAY}") 655 655 message(STATUS "# FEATURE_OPENXR_SPACE_LOCAL_FLOOR: ${XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR}") 656 656 message(STATUS "# FEATURE_OPENXR_SPACE_UNBOUNDED: ${XRT_FEATURE_OPENXR_SPACE_UNBOUNDED}")
+2 -2
scripts/generate_oxr_ext_support.py
··· 64 64 ['XR_EXT_local_floor', 'XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR'], 65 65 ['XR_EXT_palm_pose', 'XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE'], 66 66 ['XR_EXT_samsung_odyssey_controller', 'XRT_FEATURE_OPENXR_INTERACTION_WINMR'], 67 - ['XR_FB_composition_layer_image_layout', 'XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT'], 68 - ['XR_FB_composition_layer_settings', 'XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS'], 67 + ['XR_FB_composition_layer_image_layout', 'XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT'], 68 + ['XR_FB_composition_layer_settings', 'XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS'], 69 69 ['XR_FB_display_refresh_rate', 'XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE'], 70 70 ['XR_ML_ml2_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_ML2'], 71 71 ['XR_MND_headless', 'XRT_FEATURE_OPENXR_HEADLESS'],
+2 -2
src/xrt/include/xrt/xrt_config_build.h.cmake_in
··· 46 46 #cmakedefine XRT_FEATURE_OPENXR_LAYER_DEPTH 47 47 #cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT1 48 48 #cmakedefine XRT_FEATURE_OPENXR_LAYER_EQUIRECT2 49 - #cmakedefine XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS 50 - #cmakedefine XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT 49 + #cmakedefine XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT 50 + #cmakedefine XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS 51 51 #cmakedefine XRT_FEATURE_OPENXR_OVERLAY 52 52 #cmakedefine XRT_FEATURE_OPENXR_SPACE_LOCAL_FLOOR 53 53 #cmakedefine XRT_FEATURE_OPENXR_SPACE_UNBOUNDED
+2 -2
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 375 375 /* 376 376 * XR_FB_composition_layer_image_layout 377 377 */ 378 - #if defined(XR_FB_composition_layer_image_layout) && defined(XRT_FEATURE_OPENXR_LAYER_FB_LAYER_IMAGE_LAYOUT) 378 + #if defined(XR_FB_composition_layer_image_layout) && defined(XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT) 379 379 #define OXR_HAVE_FB_composition_layer_image_layout 380 380 #define OXR_EXTENSION_SUPPORT_FB_composition_layer_image_layout(_) \ 381 381 _(FB_composition_layer_image_layout, FB_COMPOSITION_LAYER_IMAGE_LAYOUT) ··· 387 387 /* 388 388 * XR_FB_composition_layer_settings 389 389 */ 390 - #if defined(XR_FB_composition_layer_settings) && defined(XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS) 390 + #if defined(XR_FB_composition_layer_settings) && defined(XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS) 391 391 #define OXR_HAVE_FB_composition_layer_settings 392 392 #define OXR_EXTENSION_SUPPORT_FB_composition_layer_settings(_) \ 393 393 _(FB_composition_layer_settings, FB_COMPOSITION_LAYER_SETTINGS)