diff options
| author | Ian Romanick <[email protected]> | 2010-08-13 20:22:46 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-08-13 20:22:46 -0700 |
| commit | 443a7e4e9a360acbc3e662c098be436f180bf81d (patch) | |
| tree | 71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/egl/main/eglapi.c | |
| parent | 2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff) | |
| parent | 27041d7cb3faeaed483538a228573466363ec1c7 (diff) | |
Merge branch 'master' into glsl2
Diffstat (limited to 'src/egl/main/eglapi.c')
| -rw-r--r-- | src/egl/main/eglapi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 09271140b13..4dc8707cfbc 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -379,7 +379,11 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list, _EGLContext *context; EGLContext ret; - _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT, drv); + if (config) + _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT, drv); + else + drv = _eglCheckDisplay(disp, __FUNCTION__); + if (!share && share_list != EGL_NO_CONTEXT) RETURN_EGL_ERROR(disp, EGL_BAD_CONTEXT, EGL_NO_CONTEXT); |