mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-22 14:46:27 +00:00
st/oxr: Handle XRT_ERROR_EGL_CONFIG_MISSING
This commit is contained in:
parent
0571e0337e
commit
6c3ab4151a
src/xrt/state_trackers/oxr
|
@ -69,6 +69,11 @@ oxr_session_populate_egl(struct oxr_logger *log,
|
||||||
next->getProcAddress, //
|
next->getProcAddress, //
|
||||||
&xcgl); //
|
&xcgl); //
|
||||||
|
|
||||||
|
if (xret == XRT_ERROR_EGL_CONFIG_MISSING) {
|
||||||
|
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
|
||||||
|
"XrGraphicsBindingEGLMNDX::config can not be null when EGL_KHR_no_config_context is "
|
||||||
|
"not supported by the display.");
|
||||||
|
}
|
||||||
if (xret != XR_SUCCESS || xcgl == NULL) {
|
if (xret != XR_SUCCESS || xcgl == NULL) {
|
||||||
return oxr_error(log, XR_ERROR_INITIALIZATION_FAILED, "Failed to create an egl client compositor");
|
return oxr_error(log, XR_ERROR_INITIALIZATION_FAILED, "Failed to create an egl client compositor");
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,6 +77,11 @@ oxr_session_populate_gles_android(struct oxr_logger *log,
|
||||||
get_proc_addr, //
|
get_proc_addr, //
|
||||||
&xcgl); //
|
&xcgl); //
|
||||||
|
|
||||||
|
if (xret == XRT_ERROR_EGL_CONFIG_MISSING) {
|
||||||
|
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE,
|
||||||
|
"XrGraphicsBindingEGLMNDX::config can not be null when EGL_KHR_no_config_context is "
|
||||||
|
"not supported by the display.");
|
||||||
|
}
|
||||||
if (xret != XR_SUCCESS || xcgl == NULL) {
|
if (xret != XR_SUCCESS || xcgl == NULL) {
|
||||||
return oxr_error(log, XR_ERROR_INITIALIZATION_FAILED, "Failed to create an egl client compositor");
|
return oxr_error(log, XR_ERROR_INITIALIZATION_FAILED, "Failed to create an egl client compositor");
|
||||||
}
|
}
|
||||||
|
|
|
@ -564,9 +564,7 @@ oxr_verify_XrGraphicsBindingEGLMNDX(struct oxr_logger *log, const XrGraphicsBind
|
||||||
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XrGraphicsBindingEGLMNDX::display cannot be NULL");
|
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XrGraphicsBindingEGLMNDX::display cannot be NULL");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (next->config == NULL) {
|
// The next->config field can be NULL if EGL_KHR_no_config_context is supported by the display.
|
||||||
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XrGraphicsBindingEGLMNDX::config cannot be NULL");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (next->context == NULL) {
|
if (next->context == NULL) {
|
||||||
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XrGraphicsBindingEGLMNDX::context cannot be NULL");
|
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "XrGraphicsBindingEGLMNDX::context cannot be NULL");
|
||||||
|
|
Loading…
Reference in a new issue