Module: Mesa Branch: staging/21.0 Commit: 4ffcada22984ee15124088584ce79619417f96ea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ffcada22984ee15124088584ce79619417f96ea
Author: Tapani Pälli <tapani.pa...@intel.com> Date: Tue Apr 6 19:03:04 2021 +0300 egl: support no error attribute set to false with ES 1.1 We advertise the extension so it should support case where context has attribute EGL_CONTEXT_OPENGL_NO_ERROR_KHR set to EGL_FALSE indepdendent of ES version used. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4586 Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Adam Jackson <a...@redhat.com> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10102> (cherry picked from commit 053236575958bb2a29ad88b77021e0ea3f08a957) --- .pick_status.json | 2 +- src/egl/main/eglcontext.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9b2a4218f69..fa1996c9eed 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -193,7 +193,7 @@ "description": "egl: support no error attribute set to false with ES 1.1", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 65dc886abbb..15de7c99496 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -334,8 +334,8 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *disp, /* The KHR_no_error spec only applies against OpenGL 2.0+ and * OpenGL ES 2.0+ */ - if ((api != EGL_OPENGL_API && api != EGL_OPENGL_ES_API) || - ctx->ClientMajorVersion < 2) { + if (((api != EGL_OPENGL_API && api != EGL_OPENGL_ES_API) || + ctx->ClientMajorVersion < 2) && val == EGL_TRUE) { err = EGL_BAD_ATTRIBUTE; break; } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
