diff options
| -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 @@ -483,15 +483,11 @@ dri2_setup_screen(_EGLDisplay *disp) if (dri2_dpy->dri2) { 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; } } else { 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; } if (dri2_dpy->image) { 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 @@ -427,9 +427,7 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list, if (!config) { /* 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); } @@ -487,9 +485,7 @@ eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, RETURN_EGL_ERROR(disp, EGL_BAD_CONTEXT, EGL_FALSE); if (!draw_surf || !read_surf) { /* 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); if ((!draw_surf && draw != EGL_NO_SURFACE) || 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"); /* 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 @@ -103,9 +103,7 @@ struct _egl_extensions EGLBoolean KHR_reusable_sync; EGLBoolean KHR_fence_sync; - EGLBoolean KHR_surfaceless_gles1; - EGLBoolean KHR_surfaceless_gles2; - EGLBoolean KHR_surfaceless_opengl; + EGLBoolean KHR_surfaceless_context; EGLBoolean NOK_swap_region; EGLBoolean NOK_texture_from_pixmap; 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 @@ -107,9 +107,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy) _EGL_CHECK_EXTENSION(KHR_reusable_sync); _EGL_CHECK_EXTENSION(KHR_fence_sync); - _EGL_CHECK_EXTENSION(KHR_surfaceless_gles1); - _EGL_CHECK_EXTENSION(KHR_surfaceless_gles2); - _EGL_CHECK_EXTENSION(KHR_surfaceless_opengl); + _EGL_CHECK_EXTENSION(KHR_surfaceless_context); _EGL_CHECK_EXTENSION(NOK_swap_region); _EGL_CHECK_EXTENSION(NOK_texture_from_pixmap); 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 @@ -583,9 +583,7 @@ egl_g3d_initialize(_EGLDriver *drv, _EGLDisplay *dpy) dpy->Extensions.KHR_reusable_sync = EGL_TRUE; dpy->Extensions.KHR_fence_sync = EGL_TRUE; - 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; if (dpy->Platform == _EGL_PLATFORM_DRM) { dpy->Extensions.MESA_drm_display = EGL_TRUE; |