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

st/oxr: Add and use XRT_CAST_PTR_TO_OXR_HANDLE macro to avoid warnings.

Browse source 
Other places we do these similar conversions will need this same modification.
This commit is contained in:
Ryan Pavlik 2020-04-28 17:38:57 -05:00
parent 018e37c0a1
commit cecb8f31af
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,18 @@ extern "C" {
* @ingroup xrt * @ingroup xrt
*/ */
/*!
* @brief Cast a pointer to an OpenXR handle in such a way as to avoid warnings.
*
* Avoids -Wpointer-to-int-cast by first casting to the same size int, then
* promoting to the 64-bit int, then casting to the handle type. That's a lot of
* no-ops on 64-bit, but a widening conversion on 32-bit.
*
* @ingroup oxr
*/
#define XRT_CAST_PTR_TO_OXR_HANDLE(HANDLE_TYPE, PTR) \
((HANDLE_TYPE)(uint64_t)(uintptr_t)(PTR))
/*! /*!
* @defgroup oxr_main OpenXR main code * @defgroup oxr_main OpenXR main code
* *
@ -151,7 +163,7 @@ oxr_handle_state_to_string(enum oxr_handle_state state);
static inline XrInstance static inline XrInstance
oxr_instance_to_openxr(struct oxr_instance *inst) oxr_instance_to_openxr(struct oxr_instance *inst)
{ {
return (XrInstance)inst; return XRT_CAST_PTR_TO_OXR_HANDLE(XrInstance, inst);
} }
XrResult XrResult
@ -264,7 +276,7 @@ oxr_source_get_pose_input(struct oxr_logger *log,
static inline XrActionSet static inline XrActionSet
oxr_action_set_to_openxr(struct oxr_action_set *act_set) oxr_action_set_to_openxr(struct oxr_action_set *act_set)
{ {
return (XrActionSet)act_set; return XRT_CAST_PTR_TO_OXR_HANDLE(XrActionSet, act_set);
} }
XrResult XrResult
@ -279,7 +291,7 @@ oxr_action_set_create(struct oxr_logger *log,
static inline XrAction static inline XrAction
oxr_action_to_openxr(struct oxr_action *act) oxr_action_to_openxr(struct oxr_action *act)
{ {
return (XrAction)act; return XRT_CAST_PTR_TO_OXR_HANDLE(XrAction, act);
} }
XrResult XrResult
@ -421,7 +433,7 @@ oxr_action_enumerate_bound_sources(struct oxr_logger *log,
static inline XrSession static inline XrSession
oxr_session_to_openxr(struct oxr_session *sess) oxr_session_to_openxr(struct oxr_session *sess)
{ {
return (XrSession)sess; return XRT_CAST_PTR_TO_OXR_HANDLE(XrSession, sess);
} }
XrResult XrResult
@ -496,7 +508,7 @@ oxr_session_frame_end(struct oxr_logger *log,
static inline XrSpace static inline XrSpace
oxr_space_to_openxr(struct oxr_space *spc) oxr_space_to_openxr(struct oxr_space *spc)
{ {
return (XrSpace)spc; return XRT_CAST_PTR_TO_OXR_HANDLE(XrSpace, spc);
} }
XrResult XrResult
@ -540,7 +552,7 @@ oxr_space_ref_relation(struct oxr_logger *log,
static inline XrSwapchain static inline XrSwapchain
oxr_swapchain_to_openxr(struct oxr_swapchain *sc) oxr_swapchain_to_openxr(struct oxr_swapchain *sc)
{ {
return (XrSwapchain)sc; return XRT_CAST_PTR_TO_OXR_HANDLE(XrSwapchain, sc);
} }
XrResult XrResult
@ -562,7 +574,7 @@ oxr_create_swapchain(struct oxr_logger *,
static inline XrDebugUtilsMessengerEXT static inline XrDebugUtilsMessengerEXT
oxr_messenger_to_openxr(struct oxr_debug_messenger *mssngr) oxr_messenger_to_openxr(struct oxr_debug_messenger *mssngr)
{ {
return (XrDebugUtilsMessengerEXT)mssngr; return XRT_CAST_PTR_TO_OXR_HANDLE(XrDebugUtilsMessengerEXT, mssngr);
} }
XrResult XrResult