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

st/oxr: Fix verifying XrSessionCreateInfo and graphics bindings structs.

Browse source 
Don't enforce next == NULL, and look through entire chain for structure
type enum, using oxr_chain.h
This commit is contained in:
Ryan Pavlik 2019-06-03 14:13:05 -05:00 committed by Jakob Bornecrantz
parent fa8047fed3
commit 0a523bef05
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/xrt/state_trackers/oxr/oxr_verify.cpp
View file

@ -18,6 +18,7 @@
#include "oxr_objects.h" #include "oxr_objects.h"
#include "oxr_logger.h" #include "oxr_logger.h"
#include "oxr_api_verify.h" #include "oxr_api_verify.h"
#include "oxr_chain.h"
/* /*
@ -279,45 +280,55 @@ oxr_verify_XrSessionCreateInfo(struct oxr_logger* log,
"(createInfo->type)"); "(createInfo->type)");
} }
if (createInfo->next == NULL) {
if (inst->headless) {
return XR_SUCCESS;
}
return oxr_error(log, XR_ERROR_GRAPHICS_DEVICE_INVALID,
"createInfo->next");
}
XrStructureType* next_type = (XrStructureType*)createInfo->next;
#ifdef XR_USE_PLATFORM_XLIB #ifdef XR_USE_PLATFORM_XLIB
if (*next_type == XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR) { XrGraphicsBindingOpenGLXlibKHR const* opengl_xlib =
OXR_GET_INPUT_FROM_CHAIN(createInfo,
XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR,
XrGraphicsBindingOpenGLXlibKHR);
if (opengl_xlib != NULL) {
if (!inst->opengl_enable) { if (!inst->opengl_enable) {
return oxr_error( return oxr_error(
log, XR_ERROR_VALIDATION_FAILURE, log, XR_ERROR_VALIDATION_FAILURE,
" OpenGL " " OpenGL "
"requires " XR_KHR_OPENGL_ENABLE_EXTENSION_NAME); "requires " XR_KHR_OPENGL_ENABLE_EXTENSION_NAME);
} }
return oxr_verify_XrGraphicsBindingOpenGLXlibKHR( return oxr_verify_XrGraphicsBindingOpenGLXlibKHR(log,
log, (XrGraphicsBindingOpenGLXlibKHR*)createInfo->next); opengl_xlib);
} else }
#endif #endif
#ifdef XR_USE_GRAPHICS_API_VULKAN #ifdef XR_USE_GRAPHICS_API_VULKAN
if (*next_type == XR_TYPE_GRAPHICS_BINDING_VULKAN_KHR) { XrGraphicsBindingVulkanKHR const* vulkan = OXR_GET_INPUT_FROM_CHAIN(
createInfo, XR_TYPE_GRAPHICS_BINDING_VULKAN_KHR,
XrGraphicsBindingVulkanKHR);
if (vulkan != NULL) {
if (!inst->vulkan_enable) { if (!inst->vulkan_enable) {
return oxr_error( return oxr_error(
log, XR_ERROR_VALIDATION_FAILURE, log, XR_ERROR_VALIDATION_FAILURE,
" Vulkan " " Vulkan "
"requires " XR_KHR_VULKAN_ENABLE_EXTENSION_NAME); "requires " XR_KHR_VULKAN_ENABLE_EXTENSION_NAME);
} }
return oxr_verify_XrGraphicsBindingVulkanKHR( return oxr_verify_XrGraphicsBindingVulkanKHR(log, vulkan);
log, (XrGraphicsBindingVulkanKHR*)createInfo->next); }
} else
#endif #endif
{
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, /*
"createInfo->next->type"); * Add any new graphics binding structs here - before the headless
* check. (order for non-headless checks not specified in standard.)
* Add a new verify function below.
* Any new addition will also need to be added to
* oxr_session_create_impl.
*/
/* We didn't recognize any graphics binding structs in the chain - our
* last hope is headless. */
if (inst->headless) {
return XR_SUCCESS;
} }
return XR_SUCCESS; return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"createInfo->next->type");
} }
@ -332,11 +343,6 @@ oxr_verify_XrGraphicsBindingOpenGLXlibKHR(
"createInfo->next->type"); "createInfo->next->type");
} }
if (next->next != NULL) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"createInfo->next->next");
}
return XR_SUCCESS; return XR_SUCCESS;
} }
@ -354,11 +360,6 @@ oxr_verify_XrGraphicsBindingVulkanKHR(struct oxr_logger* log,
"createInfo->next->type"); "createInfo->next->type");
} }
if (next->next != NULL) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
"createInfo->next->next");
}
return XR_SUCCESS; return XR_SUCCESS;
} }