diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-18 13:17:50 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-14 15:41:02 -0700 |
| commit | 38f91f2b08e2457fa637c631490fe713e8ee5429 (patch) | |
| tree | faf62f1dd32adf6fb5432c0dc8b95464d932dfd5 | |
| parent | 0c445bb618479adceb9243098fc20bebac4eecc7 (diff) | |
egl_dri2: Require DRI2 version 2
The extra block in dri2_create_context is to prevent extra white space noise
in the next patch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index a78ee8b4217..cc37bf02932 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -308,7 +308,7 @@ struct dri2_extension_match { static struct dri2_extension_match dri2_driver_extensions[] = { { __DRI_CORE, 1, offsetof(struct dri2_egl_display, core) }, - { __DRI_DRI2, 1, offsetof(struct dri2_egl_display, dri2) }, + { __DRI_DRI2, 2, offsetof(struct dri2_egl_display, dri2) }, { NULL, 0, 0 } }; @@ -464,10 +464,7 @@ dri2_setup_screen(_EGLDisplay *disp) unsigned int api_mask; if (dri2_dpy->dri2) { - if (dri2_dpy->dri2->base.version >= 2) - api_mask = dri2_dpy->dri2->getAPIMask(dri2_dpy->dri_screen); - else - api_mask = 1 << __DRI_API_OPENGL; + api_mask = dri2_dpy->dri2->getAPIMask(dri2_dpy->dri_screen); } else { assert(dri2_dpy->swrast); api_mask = 1 << __DRI_API_OPENGL | 1 << __DRI_API_GLES | 1 << __DRI_API_GLES2; @@ -481,14 +478,8 @@ dri2_setup_screen(_EGLDisplay *disp) if (api_mask & (1 << __DRI_API_GLES2)) disp->ClientAPIs |= EGL_OPENGL_ES2_BIT; - if (dri2_dpy->dri2) { - if (dri2_dpy->dri2->base.version >= 2) { - disp->Extensions.KHR_surfaceless_context = EGL_TRUE; - } - } else { - assert(dri2_dpy->swrast); - disp->Extensions.KHR_surfaceless_context = EGL_TRUE; - } + assert(dri2_dpy->dri2 || dri2_dpy->swrast); + disp->Extensions.KHR_surfaceless_context = EGL_TRUE; if (dri2_dpy->image) { disp->Extensions.MESA_drm_image = EGL_TRUE; @@ -706,21 +697,13 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, dri_config = NULL; if (dri2_dpy->dri2) { - if (dri2_dpy->dri2->base.version >= 2) { + { dri2_ctx->dri_context = dri2_dpy->dri2->createNewContextForAPI(dri2_dpy->dri_screen, api, dri_config, shared, dri2_ctx); - } else if (api == __DRI_API_OPENGL) { - dri2_ctx->dri_context = - dri2_dpy->dri2->createNewContext(dri2_dpy->dri_screen, - dri_config, - shared, - dri2_ctx); - } else { - /* fail */ } } else { assert(dri2_dpy->swrast); |