diff options
| author | Grigori Goronzy <[email protected]> | 2017-07-19 23:51:55 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-07-26 11:50:32 +0100 |
| commit | 39bf7756b9a56b4827fecabfca00a8139feecd25 (patch) | |
| tree | 8fd406962a876dffd96ff7e55414dcf226e52d02 | |
| parent | a973b9a9f8fe50f3d34d00fbf104e19d00f12560 (diff) | |
egl: move KHR_no_error vs debug/robustness check further down
We'll fail to flag an error if the context flags appear after the
no-error attribute in the context attribute list.
Delay the check to after attribute parsing to fix this.
Fixes: 4909519a665 ("egl: Add EGL_KHR_create_context_no_error support")
Cc: [email protected]
[Emil Velikov: add fixes/stable tags, commit message polish]
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/egl/main/eglcontext.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 1a8e9bda1a2..1b03160439a 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -328,17 +328,6 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy, break; } - /* The EGL_KHR_create_context_no_error spec says: - * - * "BAD_MATCH is generated if the EGL_CONTEXT_OPENGL_NO_ERROR_KHR is TRUE at - * the same time as a debug or robustness context is specified." - */ - if (ctx->Flags & EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR || - ctx->Flags & EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR) { - err = EGL_BAD_MATCH; - break; - } - /* Canonicalize value to EGL_TRUE/EGL_FALSE definitions */ ctx->NoError = !!val; break; @@ -489,6 +478,16 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy, break; } + /* The EGL_KHR_create_context_no_error spec says: + * + * "BAD_MATCH is generated if the EGL_CONTEXT_OPENGL_NO_ERROR_KHR is TRUE at + * the same time as a debug or robustness context is specified." + */ + if (ctx->NoError && (ctx->Flags & EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR || + ctx->Flags & EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR)) { + err = EGL_BAD_MATCH; + } + if ((ctx->Flags & ~(EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR | EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR | EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR)) != 0) { |