mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: debug utils extension cleanup

Browse source
This commit is contained in:
Ryan Pavlik 2019-08-19 17:12:14 -05:00
parent 077d0c39c5
commit 2389c207f5
4 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/xrt/state_trackers/oxr/oxr_api_debug.c
View file

@ -13,7 +13,6 @@
#include "oxr_api_funcs.h" #include "oxr_api_funcs.h"
#include "oxr_api_verify.h" #include "oxr_api_verify.h"
#ifdef XR_EXT_debug_utils
XrResult XrResult
@ -121,5 +120,3 @@ oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session,
return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented"); return oxr_error(&log, XR_ERROR_RUNTIME_FAILURE, " not implemented");
} }
#endif

3
src/xrt/state_trackers/oxr/oxr_api_funcs.h
View file

@ -381,8 +381,6 @@ oxr_xrReleaseSwapchainImage(XrSwapchain swapchain,
* *
*/ */
#ifdef XR_EXT_debug_utils
//! OpenXR API function @ep{xrSetDebugUtilsObjectNameEXT} //! OpenXR API function @ep{xrSetDebugUtilsObjectNameEXT}
XrResult XrResult
oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance, oxr_xrSetDebugUtilsObjectNameEXT(XrInstance instance,
@ -420,7 +418,6 @@ oxr_xrSessionEndDebugUtilsLabelRegionEXT(XrSession session);
XrResult XrResult
oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session, oxr_xrSessionInsertDebugUtilsLabelEXT(XrSession session,
const XrDebugUtilsLabelEXT* labelInfo); const XrDebugUtilsLabelEXT* labelInfo);
#endif
/* /*

5
src/xrt/state_trackers/oxr/oxr_messenger.c
View file

@ -16,8 +16,6 @@
#include "oxr_logger.h" #include "oxr_logger.h"
#include "oxr_handle.h" #include "oxr_handle.h"
#ifdef XR_EXT_debug_utils
static XrResult static XrResult
oxr_messenger_destroy(struct oxr_logger *log, struct oxr_handle_base *hb) 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; *out_mssngr = mssngr;
return XR_SUCCESS; return XR_SUCCESS;
} }
#endif // XR_EXT_debug_utils

9
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -498,7 +498,6 @@ oxr_create_swapchain(struct oxr_logger *,
* *
*/ */
#ifdef XR_EXT_debug_utils
/*! /*!
* To go back to a OpenXR object. * To go back to a OpenXR object.
*/ */
@ -516,7 +515,8 @@ oxr_create_messenger(struct oxr_logger *,
XrResult XrResult
oxr_destroy_messenger(struct oxr_logger *log, oxr_destroy_messenger(struct oxr_logger *log,
struct oxr_debug_messenger *mssngr); struct oxr_debug_messenger *mssngr);
#endif // XR_EXT_debug_utils
/* /*
* *
* oxr_system.c * oxr_system.c
@ -826,10 +826,8 @@ struct oxr_instance
XrPath gamepad; XrPath gamepad;
} path_cache; } path_cache;
#ifdef XR_EXT_debug_utils
//! Debug messengers //! Debug messengers
struct oxr_debug_messenger *messengers[XRT_MAX_HANDLE_CHILDREN]; 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. //! Onwer of this messenger.
struct oxr_instance *inst; struct oxr_instance *inst;
#ifdef XR_EXT_debug_utils
//! Severities to submit to this messenger //! Severities to submit to this messenger
XrDebugUtilsMessageSeverityFlagsEXT message_severities; XrDebugUtilsMessageSeverityFlagsEXT message_severities;
@ -1126,8 +1123,6 @@ struct oxr_debug_messenger
//! Opaque user data //! Opaque user data
void *XR_MAY_ALIAS user_data; void *XR_MAY_ALIAS user_data;
#endif // XR_EXT_debug_utils
}; };
/*! /*!