intel: In the i915 driver, the chipset cannot be i965
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 7 Aug 2012 19:05:35 +0000 (12:05 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 14 Aug 2012 00:23:24 +0000 (17:23 -0700)
In the i965 dirver, the chipset must be i965.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/drivers/dri/intel/intel_screen.c

index f3592af621a6bb661cf5230882dcb54bb0ba23e2..cdae702adf5a0f68a09273a3052dc6f0ad4f38c8 100644 (file)
@@ -733,20 +733,17 @@ intelCreateContext(gl_api api,
 
 #ifdef I915
    if (IS_9XX(intelScreen->deviceID)) {
-      if (!IS_965(intelScreen->deviceID)) {
-        success = i915CreateContext(api, mesaVis, driContextPriv,
-                                    sharedContextPrivate);
-      }
+      success = i915CreateContext(api, mesaVis, driContextPriv,
+                                  sharedContextPrivate);
    } else {
       intelScreen->no_vbo = true;
       success = i830CreateContext(mesaVis, driContextPriv,
                                  sharedContextPrivate);
    }
 #else
-   if (IS_965(intelScreen->deviceID))
-      success = brwCreateContext(api, mesaVis,
-                             driContextPriv,
-                             sharedContextPrivate);
+   success = brwCreateContext(api, mesaVis,
+                             driContextPriv,
+                             sharedContextPrivate);
 #endif
 
    if (success) {