[915] Revert broken context creation change from IS_915 commit.
authorEric Anholt <eric@anholt.net>
Fri, 15 Feb 2008 21:16:01 +0000 (13:16 -0800)
committerEric Anholt <eric@anholt.net>
Fri, 15 Feb 2008 21:18:09 +0000 (13:18 -0800)
The IS_945 case was left to fall through to the 830 case, along with the
not-recognized-at-all case, making that dead code.

src/mesa/drivers/dri/intel/intel_screen.c

index d91bb38e30d038d959bc0a6f67b01eafe1706c1a..2392c2c49ccc0cecdca48e94003b673e09a3d647 100644 (file)
@@ -645,9 +645,11 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private;
 
 #ifdef I915
-   if (IS_915(intelScreen->deviceID)) {
-      return i915CreateContext(mesaVis, driContextPriv,
+   if (IS_9XX(intelScreen->deviceID)) {
+      if (!IS_965(intelScreen->deviceID)) {
+        return i915CreateContext(mesaVis, driContextPriv,
                                  sharedContextPrivate);
+      }
    } else {
       return i830CreateContext(mesaVis, driContextPriv, sharedContextPrivate);
    }