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: Refactor function returning to actually raise error this time

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-07-15 19:46:06 +01:00
parent 97939accda
commit 223206dc24
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,7 @@ oxr_xrEnumerateApiLayerProperties(uint32_t propertyCapacityInput,
#define ENTRY_IF(funcName) \ #define ENTRY_IF(funcName) \
if (strcmp(name, #funcName) == 0) { \ if (strcmp(name, #funcName) == 0) { \
PFN_##funcName ret = &oxr_##funcName; \ PFN_##funcName ret = &oxr_##funcName; \
*function = (PFN_xrVoidFunction)(ret); \ function = (PFN_xrVoidFunction)(ret); \
} }
/*! /*!
@ -124,7 +124,7 @@ oxr_xrEnumerateApiLayerProperties(uint32_t propertyCapacityInput,
else if (strcmp(name, #funcName) == 0) \ else if (strcmp(name, #funcName) == 0) \
{ \ { \
PFN_##funcName ret = &oxr_##funcName; \ PFN_##funcName ret = &oxr_##funcName; \
*function = (PFN_xrVoidFunction)(ret); \ function = (PFN_xrVoidFunction)(ret); \
} }
/*! /*!
@ -133,8 +133,10 @@ oxr_xrEnumerateApiLayerProperties(uint32_t propertyCapacityInput,
static XrResult static XrResult
handle_none_null(struct oxr_logger* log, handle_none_null(struct oxr_logger* log,
const char* name, const char* name,
PFN_xrVoidFunction* function) PFN_xrVoidFunction* out_function)
{ {
PFN_xrVoidFunction function = NULL;
ENTRY_IF(xrGetInstanceProcAddr) ENTRY_IF(xrGetInstanceProcAddr)
ENTRY_ELSE_IF(xrEnumerateApiLayerProperties) ENTRY_ELSE_IF(xrEnumerateApiLayerProperties)
ENTRY_ELSE_IF(xrEnumerateInstanceExtensionProperties) ENTRY_ELSE_IF(xrEnumerateInstanceExtensionProperties)
@ -220,12 +222,12 @@ handle_none_null(struct oxr_logger* log,
ENTRY_ELSE_IF(xrGetVulkanGraphicsRequirementsKHR) ENTRY_ELSE_IF(xrGetVulkanGraphicsRequirementsKHR)
#endif #endif
if (function == NULL) {
if ((*function) == NULL) {
return oxr_error(log, XR_ERROR_FUNCTION_UNSUPPORTED, return oxr_error(log, XR_ERROR_FUNCTION_UNSUPPORTED,
"(name = \"%s\")", name); "(name = \"%s\")", name);
} }
*out_function = function;
return XR_SUCCESS; return XR_SUCCESS;
} }
@ -235,16 +237,19 @@ handle_none_null(struct oxr_logger* log,
static XrResult static XrResult
handle_null(struct oxr_logger* log, handle_null(struct oxr_logger* log,
const char* name, const char* name,
PFN_xrVoidFunction* function) PFN_xrVoidFunction* out_function)
{ {
PFN_xrVoidFunction function = NULL;
ENTRY_IF(xrCreateInstance) ENTRY_IF(xrCreateInstance)
ENTRY_ELSE_IF(xrEnumerateInstanceExtensionProperties) ENTRY_ELSE_IF(xrEnumerateInstanceExtensionProperties)
if ((*function) == NULL) { if (function == NULL) {
return oxr_error(log, XR_ERROR_FUNCTION_UNSUPPORTED, return oxr_error(log, XR_ERROR_FUNCTION_UNSUPPORTED,
"(name = \"%s\")", name); "(name = \"%s\")", name);
} }
*out_function = function;
return XR_SUCCESS; return XR_SUCCESS;
} }