From 979e4b9c3f5b1272df807c0195a85d980c45ea29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Thu, 20 Oct 2016 14:11:16 +0300 Subject: [PATCH] egl: add check that eglCreateContext gets a valid config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes following dEQP test: dEQP-EGL.functional.negative_api.create_context v2: don't break EGL_KHR_no_config_context (Eric Engestrom) Signed-off-by: Tapani Pälli Reviewed-by: Emil Velikov Reviewed-by: Eric Engestrom Cc: "12.0 13.0" (cherry picked from commit 5876f3c85a61d73bb4863331bd641152a40a7b0c) [Emil Velikov: drop EGL_NO_CONFIG_KHR, use MESA_configless_context] Signed-off-by: Emil Velikov Conflicts: src/egl/main/eglapi.c --- src/egl/main/eglapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 4700dbe42f6..55243ec78d8 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -627,7 +627,9 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list, _EGL_CHECK_DISPLAY(disp, EGL_NO_CONTEXT, drv); - if (!config && !disp->Extensions.MESA_configless_context) + if (config) + _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT, drv); + else if (!disp->Extensions.MESA_configless_context) RETURN_EGL_ERROR(disp, EGL_BAD_CONFIG, EGL_NO_CONTEXT); if (!share && share_list != EGL_NO_CONTEXT)