From ec2d6dd261abecd33fcf8f6370f11361ac09e456 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Wed, 4 Sep 2019 10:37:16 -0500
Subject: [PATCH] Disable debug extension for testing purposes
---
src/xrt/state_trackers/oxr/CMakeLists.txt | 2 --
src/xrt/state_trackers/oxr/oxr_api_negotiate.c | 2 ++
src/xrt/state_trackers/oxr/oxr_extension_support.h | 1 -
src/xrt/state_trackers/oxr/oxr_messenger.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/xrt/state_trackers/oxr/CMakeLists.txt b/src/xrt/state_trackers/oxr/CMakeLists.txt
index e48e9fdde..594cbe53a 100644
--- a/src/xrt/state_trackers/oxr/CMakeLists.txt
+++ b/src/xrt/state_trackers/oxr/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories(
set(OXR_SOURCE_FILES
oxr_api_action.c
- oxr_api_debug.c
oxr_api_funcs.h
oxr_api_instance.c
oxr_api_negotiate.c
@@ -26,7 +25,6 @@ set(OXR_SOURCE_FILES
oxr_instance.c
oxr_logger.cpp
oxr_logger.h
- oxr_messenger.c
oxr_objects.h
oxr_path.c
oxr_session.c
diff --git a/src/xrt/state_trackers/oxr/oxr_api_negotiate.c b/src/xrt/state_trackers/oxr/oxr_api_negotiate.c
index 0bb1d9fda..07ba8c9f7 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_negotiate.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_negotiate.c
@@ -225,6 +225,7 @@ handle_non_null(struct oxr_instance* inst,
ENTRY_IF_EXT(xrThermalGetTemperatureTrendEXT, EXT_thermal_query)
#endif // OXR_HAVE_EXT_thermal_query
+#if 0
#ifdef OXR_HAVE_EXT_debug_utils
ENTRY_IF_EXT(xrSetDebugUtilsObjectNameEXT, EXT_debug_utils);
ENTRY_IF_EXT(xrCreateDebugUtilsMessengerEXT, EXT_debug_utils);
@@ -234,6 +235,7 @@ handle_non_null(struct oxr_instance* inst,
ENTRY_IF_EXT(xrSessionEndDebugUtilsLabelRegionEXT, EXT_debug_utils);
ENTRY_IF_EXT(xrSessionInsertDebugUtilsLabelEXT, EXT_debug_utils);
#endif // OXR_HAVE_EXT_debug_utils
+#endif
#ifdef OXR_HAVE_KHR_opengl_enable
ENTRY_IF_EXT(xrGetOpenGLGraphicsRequirementsKHR, KHR_opengl_enable);
diff --git a/src/xrt/state_trackers/oxr/oxr_extension_support.h b/src/xrt/state_trackers/oxr/oxr_extension_support.h
index c1a024a7e..2e0846b0c 100644
--- a/src/xrt/state_trackers/oxr/oxr_extension_support.h
+++ b/src/xrt/state_trackers/oxr/oxr_extension_support.h
@@ -92,7 +92,6 @@
*/
// clang-format off
#define OXR_EXTENSION_SUPPORT_GENERATE(_) \
- OXR_EXTENSION_SUPPORT_EXT_debug_utils(_) \
OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \
OXR_EXTENSION_SUPPORT_KHR_opengl_enable(_) \
OXR_EXTENSION_SUPPORT_KHR_vulkan_enable(_) \
diff --git a/src/xrt/state_trackers/oxr/oxr_messenger.c b/src/xrt/state_trackers/oxr/oxr_messenger.c
index a461ce53e..ae314bfe0 100644
--- a/src/xrt/state_trackers/oxr/oxr_messenger.c
+++ b/src/xrt/state_trackers/oxr/oxr_messenger.c
@@ -55,7 +55,7 @@ oxr_create_messenger(struct oxr_logger *log,
if (parent_slot == NULL) {
return oxr_error(
log, XR_ERROR_LIMIT_REACHED,
- " nstance cannot hold any more debug messengers");
+ " Instance cannot hold any more debug messengers");
}
struct oxr_debug_messenger *mssngr = NULL;
--
GitLab