summaryrefslogtreecommitdiffstats
path: root/src/egl
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2016-10-20 14:11:16 +0300
committerTapani Pälli <[email protected]>2016-10-25 07:24:11 +0300
commit5876f3c85a61d73bb4863331bd641152a40a7b0c (patch)
tree0b60f47eee3a466e9e85b0ba5a1d29d77661d538 /src/egl
parent58b4fef8bb7b959ac0918d08a76c92c4c86cb262 (diff)
egl: add check that eglCreateContext gets a valid config
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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Cc: "12.0 13.0" <[email protected]>
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/main/eglapi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index d8bd76dd12c..9db9964beee 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -734,7 +734,9 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list,
_EGL_CHECK_DISPLAY(disp, EGL_NO_CONTEXT, drv);
- if (!config && !disp->Extensions.KHR_no_config_context)
+ if (config != EGL_NO_CONFIG_KHR)
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT, drv);
+ else if (!disp->Extensions.KHR_no_config_context)
RETURN_EGL_ERROR(disp, EGL_BAD_CONFIG, EGL_NO_CONTEXT);
if (!share && share_list != EGL_NO_CONTEXT)