From 91473485fcf3e2cef465784ae5581787a2a8a3b3 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 7 Aug 2012 12:46:22 -0700
Subject: [PATCH] intel: Clean up bits of cruft in intelCreateContext

This and the previous three commits should probably be squashed together...

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/dri/intel/intel_screen.c | 51 +++++------------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 26df77f469b..55cebaca013 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -663,23 +663,6 @@ intelCreateContext(gl_api api,
    struct intel_screen *intelScreen = sPriv->driverPrivate;
    bool success = false;
 
-   switch (api) {
-   case API_OPENGL:
-   case API_OPENGLES:
-      break;
-   case API_OPENGLES2:
-#ifdef I915
-      if (!IS_9XX(intelScreen->deviceID)) {
-         *error = __DRI_CTX_ERROR_BAD_API;
-         return false;
-      }
-#endif
-      break;
-   case API_OPENGL_CORE:
-      *error = __DRI_CTX_ERROR_BAD_API;
-      return GL_FALSE;
-   }
-
 #ifdef I915
    if (IS_9XX(intelScreen->deviceID)) {
       success = i915CreateContext(api, mesaVis, driContextPriv,
@@ -690,22 +673,22 @@ intelCreateContext(gl_api api,
       case API_OPENGL:
          if (major_version > 1 || minor_version > 3) {
             *error = __DRI_CTX_ERROR_BAD_VERSION;
-            return false;
+            success = false;
          }
          break;
       case API_OPENGLES:
          break;
       default:
          *error = __DRI_CTX_ERROR_BAD_API;
-         return false;
+         success = false;
       }
 
-      intelScreen->no_vbo = true;
-      success = i830CreateContext(mesaVis, driContextPriv,
-				  sharedContextPrivate);
-      if (!success) {
-         *error = __DRI_CTX_ERROR_NO_MEMORY;
-         return false;
+      if (success) {
+         intelScreen->no_vbo = true;
+         success = i830CreateContext(mesaVis, driContextPriv,
+                                     sharedContextPrivate);
+         if (!success)
+            *error = __DRI_CTX_ERROR_NO_MEMORY;
       }
    }
 #else
@@ -715,22 +698,10 @@ intelCreateContext(gl_api api,
                               error, sharedContextPrivate);
 #endif
 
-   if (success) {
-      struct gl_context *ctx =
-	 (struct gl_context *) driContextPriv->driverPrivate;
-
-      _mesa_compute_version(ctx);
-      if (ctx->Version >= major_version * 10 + minor_version) {
-	 return true;
-      }
-
-      *error = __DRI_CTX_ERROR_BAD_VERSION;
-      intelDestroyContext(driContextPriv);
-   } else {
-      *error = __DRI_CTX_ERROR_NO_MEMORY;
-      fprintf(stderr, "Unrecognized deviceID 0x%x\n", intelScreen->deviceID);
-   }
+   if (success)
+      return true;
 
+   intelDestroyContext(driContextPriv);
    return false;
 }
 
-- 
2.30.2