From 2389c207f594c87101097bcce8cb104934634eec Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Mon, 19 Aug 2019 17:12:14 -0500
Subject: [PATCH] st/oxr: debug utils extension cleanup

---
 src/xrt/state_trackers/oxr/oxr_api_debug.c | 3 ---
 src/xrt/state_trackers/oxr/oxr_api_funcs.h | 3 ---
 src/xrt/state_trackers/oxr/oxr_messenger.c | 5 -----
 src/xrt/state_trackers/oxr/oxr_objects.h   | 9 ++-------
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/xrt/state_trackers/oxr/oxr_api_debug.c b/src/xrt/state_trackers/oxr/oxr_api_debug.c
index e6f678073..bc6cb8506 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_debug.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_debug.c
@@ -13,7 +13,6 @@
 #include "oxr_api_funcs.h"
 #include "oxr_api_verify.h"
 
-#ifdef XR_EXT_debug_utils
 
 
 XrResult
@@ -121,5 +120,3 @@ oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session,
 
 	return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented");
 }
-
-#endif
diff --git a/src/xrt/state_trackers/oxr/oxr_api_funcs.h b/src/xrt/state_trackers/oxr/oxr_api_funcs.h
index dcd7fed69..9e63f39bd 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_funcs.h
+++ b/src/xrt/state_trackers/oxr/oxr_api_funcs.h
@@ -381,8 +381,6 @@ oxr_xrReleaseSwapchainImage(XrSwapchain swapchain,
  *
  */
 
-#ifdef XR_EXT_debug_utils
-
 //! OpenXR API function @ep{xrSetDebugUtilsObjectNameEXT}
 XrResult
 oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance,
@@ -420,7 +418,6 @@ oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session);
 XrResult
 oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session,
                                       const XrDebugUtilsLabelEXT* labelInfo);
-#endif
 
 
 /*
diff --git a/src/xrt/state_trackers/oxr/oxr_messenger.c b/src/xrt/state_trackers/oxr/oxr_messenger.c
index 87bef429b..a461ce53e 100644
--- a/src/xrt/state_trackers/oxr/oxr_messenger.c
+++ b/src/xrt/state_trackers/oxr/oxr_messenger.c
@@ -16,8 +16,6 @@
 #include "oxr_logger.h"
 #include "oxr_handle.h"
 
-#ifdef XR_EXT_debug_utils
-
 static XrResult
 oxr_messenger_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
 {
@@ -75,6 +73,3 @@ oxr_create_messenger(struct oxr_logger *log,
 	*out_mssngr = mssngr;
 	return XR_SUCCESS;
 }
-
-
-#endif // XR_EXT_debug_utils
diff --git a/src/xrt/state_trackers/oxr/oxr_objects.h b/src/xrt/state_trackers/oxr/oxr_objects.h
index d256441b6..7539fcf85 100644
--- a/src/xrt/state_trackers/oxr/oxr_objects.h
+++ b/src/xrt/state_trackers/oxr/oxr_objects.h
@@ -498,7 +498,6 @@ oxr_create_swapchain(struct oxr_logger *,
  *
  */
 
-#ifdef XR_EXT_debug_utils
 /*!
  * To go back to a OpenXR object.
  */
@@ -516,7 +515,8 @@ oxr_create_messenger(struct oxr_logger *,
 XrResult
 oxr_destroy_messenger(struct oxr_logger *log,
                       struct oxr_debug_messenger *mssngr);
-#endif // XR_EXT_debug_utils
+
+
 /*
  *
  * oxr_system.c
@@ -826,10 +826,8 @@ struct oxr_instance
 		XrPath gamepad;
 	} path_cache;
 
-#ifdef XR_EXT_debug_utils
 	//! Debug messengers
 	struct oxr_debug_messenger *messengers[XRT_MAX_HANDLE_CHILDREN];
-#endif // XR_EXT_debug_utils
 };
 
 /*!
@@ -1114,7 +1112,6 @@ struct oxr_debug_messenger
 	//! Onwer of this messenger.
 	struct oxr_instance *inst;
 
-#ifdef XR_EXT_debug_utils
 	//! Severities to submit to this messenger
 	XrDebugUtilsMessageSeverityFlagsEXT message_severities;
 
@@ -1126,8 +1123,6 @@ struct oxr_debug_messenger
 
 	//! Opaque user data
 	void *XR_MAY_ALIAS user_data;
-
-#endif // XR_EXT_debug_utils
 };
 
 /*!