The open source OpenXR runtime

scripts: Sort XR_HTC_facial_tracking and XR_FB_body_tracking alphabetically

+27 -27
+2 -2
scripts/generate_oxr_ext_support.py
··· 65 65 ['XR_EXT_palm_pose', 'XRT_FEATURE_OPENXR_INTERACTION_EXT_PALM_POSE'], 66 66 ['XR_EXT_performance_settings', 'XRT_FEATURE_OPENXR_PERFORMANCE_SETTINGS'], 67 67 ['XR_EXT_samsung_odyssey_controller', 'XRT_FEATURE_OPENXR_INTERACTION_WINMR'], 68 + ['XR_FB_body_tracking', 'XRT_FEATURE_OPENXR_BODY_TRACKING_FB'], 68 69 ['XR_FB_composition_layer_alpha_blend', 'XRT_FEATURE_OPENXR_LAYER_FB_ALPHA_BLEND'], 69 70 ['XR_FB_composition_layer_image_layout', 'XRT_FEATURE_OPENXR_LAYER_FB_IMAGE_LAYOUT'], 70 71 ['XR_FB_composition_layer_settings', 'XRT_FEATURE_OPENXR_LAYER_FB_SETTINGS'], 71 72 ['XR_FB_composition_layer_depth_test', 'XRT_FEATURE_OPENXR_LAYER_FB_DEPTH_TEST'], 72 73 ['XR_FB_display_refresh_rate', 'XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE'], 73 74 ['XR_FB_passthrough', 'XRT_FEATURE_OPENXR_LAYER_PASSTHROUGH'], 75 + ['XR_HTC_facial_tracking', 'XRT_FEATURE_OPENXR_FACIAL_TRACKING_HTC'], 74 76 ['XR_ML_ml2_controller_interaction', 'XRT_FEATURE_OPENXR_INTERACTION_ML2'], 75 77 ['XR_MND_headless', 'XRT_FEATURE_OPENXR_HEADLESS'], 76 78 ['XR_MND_swapchain_usage_input_attachment_bit'], ··· 84 86 ['XR_MNDX_force_feedback_curl', 'XRT_FEATURE_OPENXR_FORCE_FEEDBACK_CURL'], 85 87 ['XR_MNDX_hydra', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 86 88 ['XR_MNDX_system_buttons', 'XRT_FEATURE_OPENXR_INTERACTION_MNDX'], 87 - ['XR_HTC_facial_tracking', 'XRT_FEATURE_OPENXR_FACIAL_TRACKING_HTC'], 88 - ['XR_FB_body_tracking', 'XRT_FEATURE_OPENXR_BODY_TRACKING_FB'], 89 89 ) 90 90 91 91
+25 -25
src/xrt/state_trackers/oxr/oxr_extension_support.h
··· 384 384 385 385 386 386 /* 387 + * XR_FB_body_tracking 388 + */ 389 + #if defined(XR_FB_body_tracking) && defined(XRT_FEATURE_OPENXR_BODY_TRACKING_FB) 390 + #define OXR_HAVE_FB_body_tracking 391 + #define OXR_EXTENSION_SUPPORT_FB_body_tracking(_) _(FB_body_tracking, FB_BODY_TRACKING) 392 + #else 393 + #define OXR_EXTENSION_SUPPORT_FB_body_tracking(_) 394 + #endif 395 + 396 + 397 + /* 387 398 * XR_FB_composition_layer_alpha_blend 388 399 */ 389 400 #if defined(XR_FB_composition_layer_alpha_blend) && defined(XRT_FEATURE_OPENXR_LAYER_FB_ALPHA_BLEND) ··· 450 461 #define OXR_EXTENSION_SUPPORT_FB_passthrough(_) _(FB_passthrough, FB_PASSTHROUGH) 451 462 #else 452 463 #define OXR_EXTENSION_SUPPORT_FB_passthrough(_) 464 + #endif 465 + 466 + 467 + /* 468 + * XR_HTC_facial_tracking 469 + */ 470 + #if defined(XR_HTC_facial_tracking) && defined(XRT_FEATURE_OPENXR_FACIAL_TRACKING_HTC) 471 + #define OXR_HAVE_HTC_facial_tracking 472 + #define OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) _(HTC_facial_tracking, HTC_FACIAL_TRACKING) 473 + #else 474 + #define OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) 453 475 #endif 454 476 455 477 ··· 600 622 #define OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) 601 623 #endif 602 624 603 - 604 - /* 605 - * XR_HTC_facial_tracking 606 - */ 607 - #if defined(XR_HTC_facial_tracking) && defined(XRT_FEATURE_OPENXR_FACIAL_TRACKING_HTC) 608 - #define OXR_HAVE_HTC_facial_tracking 609 - #define OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) _(HTC_facial_tracking, HTC_FACIAL_TRACKING) 610 - #else 611 - #define OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) 612 - #endif 613 - 614 - 615 - /* 616 - * XR_FB_body_tracking 617 - */ 618 - #if defined(XR_FB_body_tracking) && defined(XRT_FEATURE_OPENXR_BODY_TRACKING_FB) 619 - #define OXR_HAVE_FB_body_tracking 620 - #define OXR_EXTENSION_SUPPORT_FB_body_tracking(_) _(FB_body_tracking, FB_BODY_TRACKING) 621 - #else 622 - #define OXR_EXTENSION_SUPPORT_FB_body_tracking(_) 623 - #endif 624 - 625 625 // end of GENERATED per-extension defines - do not modify - used by scripts 626 626 627 627 /*! ··· 678 678 OXR_EXTENSION_SUPPORT_EXT_palm_pose(_) \ 679 679 OXR_EXTENSION_SUPPORT_EXT_performance_settings(_) \ 680 680 OXR_EXTENSION_SUPPORT_EXT_samsung_odyssey_controller(_) \ 681 + OXR_EXTENSION_SUPPORT_FB_body_tracking(_) \ 681 682 OXR_EXTENSION_SUPPORT_FB_composition_layer_alpha_blend(_) \ 682 683 OXR_EXTENSION_SUPPORT_FB_composition_layer_image_layout(_) \ 683 684 OXR_EXTENSION_SUPPORT_FB_composition_layer_settings(_) \ 684 685 OXR_EXTENSION_SUPPORT_FB_composition_layer_depth_test(_) \ 685 686 OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_) \ 686 687 OXR_EXTENSION_SUPPORT_FB_passthrough(_) \ 688 + OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) \ 687 689 OXR_EXTENSION_SUPPORT_ML_ml2_controller_interaction(_) \ 688 690 OXR_EXTENSION_SUPPORT_MND_headless(_) \ 689 691 OXR_EXTENSION_SUPPORT_MND_swapchain_usage_input_attachment_bit(_) \ ··· 696 698 OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \ 697 699 OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \ 698 700 OXR_EXTENSION_SUPPORT_MNDX_hydra(_) \ 699 - OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) \ 700 - OXR_EXTENSION_SUPPORT_HTC_facial_tracking(_) \ 701 - OXR_EXTENSION_SUPPORT_FB_body_tracking(_) 701 + OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) 702 702 // clang-format on