diff options
| author | Ian Romanick <[email protected]> | 2012-07-18 09:38:34 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-06 15:37:04 -0700 |
| commit | b50703aea55450e04bcd8154335774786e0f253b (patch) | |
| tree | 15f7e93313c66946f8199e530ee2d4e7ebe89010 /src/egl/main/eglcontext.c | |
| parent | cb77f5dd1f6658fca671454c9b5be9a23c3bf3e4 (diff) | |
egl: Replace KHR_surfaceless_* extensions with KHR_surfaceless_context
KHR extension name is reserved for Khronos ratified extensions, and there is
no such thing as EGL_KHR_surfaceless_{gles1,gles2,opengl}. Replace these
three extensions with EGL_KHR_surfaceless_context since that extension
actually exists.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/egl/main/eglcontext.c')
| -rw-r--r-- | src/egl/main/eglcontext.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 17cb03786be..fa6074971da 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -244,7 +244,6 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read) _EGLThreadInfo *t = _eglGetCurrentThread(); _EGLDisplay *dpy; EGLint conflict_api; - EGLBoolean surfaceless; if (_eglIsCurrentThreadDummy()) return _eglError(EGL_BAD_ALLOC, "eglMakeCurrent"); @@ -257,22 +256,8 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read) } dpy = ctx->Resource.Display; - switch (_eglGetContextAPIBit(ctx)) { - case EGL_OPENGL_ES_BIT: - surfaceless = dpy->Extensions.KHR_surfaceless_gles1; - break; - case EGL_OPENGL_ES2_BIT: - surfaceless = dpy->Extensions.KHR_surfaceless_gles2; - break; - case EGL_OPENGL_BIT: - surfaceless = dpy->Extensions.KHR_surfaceless_opengl; - break; - default: - surfaceless = EGL_FALSE; - break; - } - - if (!surfaceless && (draw == NULL || read == NULL)) + if (!dpy->Extensions.KHR_surfaceless_context + && (draw == NULL || read == NULL)) return _eglError(EGL_BAD_MATCH, "eglMakeCurrent"); /* |