From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 18 Jul 2012 17:08:49 +0000 (-0700)
Subject: egl_dri2: Remove swrast version >= 2 checks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=05413ddb1da5d4f17b6da891fd2d76cff4947979;p=mesa.git

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>
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index f86ed0bd5fc..480268f349a 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -470,10 +470,7 @@ dri2_setup_screen(_EGLDisplay *disp)
          api_mask = 1 << __DRI_API_OPENGL;
    } else {
       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;
-      else
-         api_mask = 1 << __DRI_API_OPENGL;
+      api_mask = 1 << __DRI_API_OPENGL | 1 << __DRI_API_GLES | 1 << __DRI_API_GLES2;
    }
 
    disp->ClientAPIs = 0;
@@ -492,11 +489,9 @@ dri2_setup_screen(_EGLDisplay *disp)
       }
    } else {
       assert(dri2_dpy->swrast);
-      if (dri2_dpy->swrast->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_gles1 = EGL_TRUE;
+      disp->Extensions.KHR_surfaceless_gles2 = EGL_TRUE;
+      disp->Extensions.KHR_surfaceless_opengl = EGL_TRUE;
    }
 
    if (dri2_dpy->image) {
@@ -733,24 +728,13 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
       }
    } else {
       assert(dri2_dpy->swrast);
-      if (dri2_dpy->swrast->base.version >= 2) {
-	 dri2_ctx->dri_context =
-	    dri2_dpy->swrast->createNewContextForAPI(dri2_dpy->dri_screen,
-						     api,
-						     dri_config,
-						     dri2_ctx_shared ? 
-						     dri2_ctx_shared->dri_context : NULL,
-						     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 */
-      }
+      dri2_ctx->dri_context =
+         dri2_dpy->swrast->createNewContextForAPI(dri2_dpy->dri_screen,
+                                                  api,
+                                                  dri_config,
+                                                  dri2_ctx_shared ?
+                                                  dri2_ctx_shared->dri_context : NULL,
+                                                  dri2_ctx);
    }
 
    if (!dri2_ctx->dri_context)