diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-18 09:38:34 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-06 15:37:04 -0700 |
commit | b50703aea55450e04bcd8154335774786e0f253b (patch) | |
tree | 15f7e93313c66946f8199e530ee2d4e7ebe89010 | |
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 <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 8 | ||||
-rw-r--r-- | src/egl/main/eglapi.c | 8 | ||||
-rw-r--r-- | src/egl/main/eglcontext.c | 19 | ||||
-rw-r--r-- | src/egl/main/egldisplay.h | 4 | ||||
-rw-r--r-- | src/egl/main/eglmisc.c | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_g3d.c | 4 |
6 files changed, 9 insertions, 38 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index ffef3bfff4f..a78ee8b4217 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -485,5 +485,3 @@ dri2_setup_screen(_EGLDisplay *disp) if (dri2_dpy->dri2->base.version >= 2) { - disp->Extensions.KHR_surfaceless_gles1 = EGL_TRUE; - disp->Extensions.KHR_surfaceless_gles2 = EGL_TRUE; - disp->Extensions.KHR_surfaceless_opengl = EGL_TRUE; + disp->Extensions.KHR_surfaceless_context = EGL_TRUE; } @@ -491,5 +489,3 @@ dri2_setup_screen(_EGLDisplay *disp) assert(dri2_dpy->swrast); - disp->Extensions.KHR_surfaceless_gles1 = EGL_TRUE; - disp->Extensions.KHR_surfaceless_gles2 = EGL_TRUE; - disp->Extensions.KHR_surfaceless_opengl = EGL_TRUE; + disp->Extensions.KHR_surfaceless_context = EGL_TRUE; } diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index ffc404cc2d7..bcc546557b8 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -429,5 +429,3 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list, /* config may be NULL if surfaceless */ - if (!disp->Extensions.KHR_surfaceless_gles1 && - !disp->Extensions.KHR_surfaceless_gles2 && - !disp->Extensions.KHR_surfaceless_opengl) + if (!disp->Extensions.KHR_surfaceless_context) RETURN_EGL_ERROR(disp, EGL_BAD_CONFIG, EGL_NO_CONTEXT); @@ -489,5 +487,3 @@ eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, /* surfaces may be NULL if surfaceless */ - if (!disp->Extensions.KHR_surfaceless_gles1 && - !disp->Extensions.KHR_surfaceless_gles2 && - !disp->Extensions.KHR_surfaceless_opengl) + if (!disp->Extensions.KHR_surfaceless_context) RETURN_EGL_ERROR(disp, EGL_BAD_SURFACE, EGL_FALSE); 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 @@ -246,3 +246,2 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read) EGLint conflict_api; - EGLBoolean surfaceless; @@ -259,18 +258,4 @@ _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"); diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 905c7a4f02a..a1dd279bf39 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -105,5 +105,3 @@ struct _egl_extensions - EGLBoolean KHR_surfaceless_gles1; - EGLBoolean KHR_surfaceless_gles2; - EGLBoolean KHR_surfaceless_opengl; + EGLBoolean KHR_surfaceless_context; diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index 9d534f0a5be..b4f1e717701 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -109,5 +109,3 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy) - _EGL_CHECK_EXTENSION(KHR_surfaceless_gles1); - _EGL_CHECK_EXTENSION(KHR_surfaceless_gles2); - _EGL_CHECK_EXTENSION(KHR_surfaceless_opengl); + _EGL_CHECK_EXTENSION(KHR_surfaceless_context); diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c index d147ad00261..239be6129e8 100644 --- a/src/gallium/state_trackers/egl/common/egl_g3d.c +++ b/src/gallium/state_trackers/egl/common/egl_g3d.c @@ -585,5 +585,3 @@ egl_g3d_initialize(_EGLDriver *drv, _EGLDisplay *dpy) - dpy->Extensions.KHR_surfaceless_gles1 = EGL_TRUE; - dpy->Extensions.KHR_surfaceless_gles2 = EGL_TRUE; - dpy->Extensions.KHR_surfaceless_opengl = EGL_TRUE; + dpy->Extensions.KHR_surfaceless_context = EGL_TRUE; |