KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl_dri2: Remove swrast version >= 2 checks 

Since support for swrast version 2 was added (f55d027a), it has also been
required.  In swrast_driver_extensions, version 2 is set for __DRI_SWRAST
extension.  Remove the spurious version checks sprinked through the code.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Ian Romanick 2012-07-18 10:08:49 -07:00
parent 63adb6b9ea
commit 05413ddb1d
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/egl/drivers/dri2/egl_dri2.c
View File

@ -470,10 +470,7 @@ dri2_setup_screen(_EGLDisplay *disp)
api_mask = 1 << __DRI_API_OPENGL; api_mask = 1 << __DRI_API_OPENGL;
} else { } else {
assert(dri2_dpy->swrast); assert(dri2_dpy->swrast);
if (dri2_dpy->swrast->base.version >= 2)
api_mask = 1 << __DRI_API_OPENGL | 1 << __DRI_API_GLES | 1 << __DRI_API_GLES2; api_mask = 1 << __DRI_API_OPENGL | 1 << __DRI_API_GLES | 1 << __DRI_API_GLES2;
else
api_mask = 1 << __DRI_API_OPENGL;
} }
disp->ClientAPIs = 0; disp->ClientAPIs = 0;
@ -492,12 +489,10 @@ dri2_setup_screen(_EGLDisplay *disp)
} }
} else { } else {
assert(dri2_dpy->swrast); assert(dri2_dpy->swrast);
if (dri2_dpy->swrast->base.version >= 2) {
disp->Extensions.KHR_surfaceless_gles1 = EGL_TRUE; disp->Extensions.KHR_surfaceless_gles1 = EGL_TRUE;
disp->Extensions.KHR_surfaceless_gles2 = EGL_TRUE; disp->Extensions.KHR_surfaceless_gles2 = EGL_TRUE;
disp->Extensions.KHR_surfaceless_opengl = EGL_TRUE; disp->Extensions.KHR_surfaceless_opengl = EGL_TRUE;
} }
}
if (dri2_dpy->image) { if (dri2_dpy->image) {
disp->Extensions.MESA_drm_image = EGL_TRUE; disp->Extensions.MESA_drm_image = EGL_TRUE;
@ -733,7 +728,6 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
} }
} else { } else {
assert(dri2_dpy->swrast); assert(dri2_dpy->swrast);
if (dri2_dpy->swrast->base.version >= 2) {
dri2_ctx->dri_context = dri2_ctx->dri_context =
dri2_dpy->swrast->createNewContextForAPI(dri2_dpy->dri_screen, dri2_dpy->swrast->createNewContextForAPI(dri2_dpy->dri_screen,
api, api,
@ -741,16 +735,6 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
dri2_ctx_shared ? dri2_ctx_shared ?
dri2_ctx_shared->dri_context : NULL, dri2_ctx_shared->dri_context : NULL,
dri2_ctx); dri2_ctx);
} else if (api == __DRI_API_OPENGL) {
dri2_ctx->dri_context =
dri2_dpy->core->createNewContext(dri2_dpy->dri_screen,
dri_config,
dri2_ctx_shared ?
dri2_ctx_shared->dri_context : NULL,
dri2_ctx);
} else {
/* fail */
}
} }
if (!dri2_ctx->dri_context) if (!dri2_ctx->dri_context)