mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Do not enable XR_EXT_debug_utils as it's not implemented yet

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-05-19 13:39:39 +01:00 committed by Jakob Bornecrantz
parent 830706e0e4
commit 1c29b22cae
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/generate_oxr_ext_support.py
View file

@ -24,7 +24,7 @@ EXTENSIONS = (
['XR_KHR_swapchain_usage_input_attachment_bit'], ['XR_KHR_swapchain_usage_input_attachment_bit'],
['XR_KHR_vulkan_enable', 'XR_USE_GRAPHICS_API_VULKAN'], ['XR_KHR_vulkan_enable', 'XR_USE_GRAPHICS_API_VULKAN'],
['XR_KHR_vulkan_enable2', 'XR_USE_GRAPHICS_API_VULKAN'], ['XR_KHR_vulkan_enable2', 'XR_USE_GRAPHICS_API_VULKAN'],
['XR_EXT_debug_utils'], ['XR_EXT_debug_utils', 'XRT_FEATURE_OPENXR_DEBUG_UTILS'],
['XR_EXT_hand_tracking'], ['XR_EXT_hand_tracking'],
['XR_FB_display_refresh_rate'], ['XR_FB_display_refresh_rate'],
['XR_MND_headless'], ['XR_MND_headless'],

1
src/xrt/include/xrt/xrt_config_build.h.cmake_in
View file

@ -15,6 +15,7 @@
#cmakedefine XRT_FEATURE_COMPOSITOR_MAIN #cmakedefine XRT_FEATURE_COMPOSITOR_MAIN
#cmakedefine XRT_FEATURE_IPC #cmakedefine XRT_FEATURE_IPC
#cmakedefine XRT_FEATURE_OPENXR #cmakedefine XRT_FEATURE_OPENXR
#cmakedefine XRT_FEATURE_OPENXR_DEBUG_UTILS
#cmakedefine XRT_FEATURE_OPENXR_LAYER_CUBE #cmakedefine XRT_FEATURE_OPENXR_LAYER_CUBE
#cmakedefine XRT_FEATURE_OPENXR_LAYER_CYLINDER #cmakedefine XRT_FEATURE_OPENXR_LAYER_CYLINDER
#cmakedefine XRT_FEATURE_OPENXR_LAYER_DEPTH #cmakedefine XRT_FEATURE_OPENXR_LAYER_DEPTH

2
src/xrt/state_trackers/oxr/oxr_api_negotiate.c
View file

@ -233,7 +233,6 @@ handle_non_null(struct oxr_instance *inst, struct oxr_logger *log, const char *n
ENTRY_IF_EXT(xrRequestDisplayRefreshRateFB, FB_display_refresh_rate); ENTRY_IF_EXT(xrRequestDisplayRefreshRateFB, FB_display_refresh_rate);
#endif #endif
#if 0
#ifdef OXR_HAVE_EXT_debug_utils #ifdef OXR_HAVE_EXT_debug_utils
ENTRY_IF_EXT(xrSetDebugUtilsObjectNameEXT, EXT_debug_utils); ENTRY_IF_EXT(xrSetDebugUtilsObjectNameEXT, EXT_debug_utils);
ENTRY_IF_EXT(xrCreateDebugUtilsMessengerEXT, EXT_debug_utils); ENTRY_IF_EXT(xrCreateDebugUtilsMessengerEXT, EXT_debug_utils);
@ -243,7 +242,6 @@ handle_non_null(struct oxr_instance *inst, struct oxr_logger *log, const char *n
ENTRY_IF_EXT(xrSessionEndDebugUtilsLabelRegionEXT, EXT_debug_utils); ENTRY_IF_EXT(xrSessionEndDebugUtilsLabelRegionEXT, EXT_debug_utils);
ENTRY_IF_EXT(xrSessionInsertDebugUtilsLabelEXT, EXT_debug_utils); ENTRY_IF_EXT(xrSessionInsertDebugUtilsLabelEXT, EXT_debug_utils);
#endif // OXR_HAVE_EXT_debug_utils #endif // OXR_HAVE_EXT_debug_utils
#endif
#ifdef OXR_HAVE_KHR_opengl_enable #ifdef OXR_HAVE_KHR_opengl_enable
ENTRY_IF_EXT(xrGetOpenGLGraphicsRequirementsKHR, KHR_opengl_enable); ENTRY_IF_EXT(xrGetOpenGLGraphicsRequirementsKHR, KHR_opengl_enable);

2
src/xrt/state_trackers/oxr/oxr_extension_support.h
View file

@ -181,7 +181,7 @@
/* /*
* XR_EXT_debug_utils * XR_EXT_debug_utils
*/ */
#if defined(XR_EXT_debug_utils) #if defined(XR_EXT_debug_utils) && defined(XRT_FEATURE_OPENXR_DEBUG_UTILS)
#define OXR_HAVE_EXT_debug_utils #define OXR_HAVE_EXT_debug_utils
#define OXR_EXTENSION_SUPPORT_EXT_debug_utils(_) _(EXT_debug_utils, EXT_DEBUG_UTILS) #define OXR_EXTENSION_SUPPORT_EXT_debug_utils(_) _(EXT_debug_utils, EXT_DEBUG_UTILS)
#else #else