summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-02-15 13:16:01 -0800
committerEric Anholt <eric@anholt.net>2008-02-15 13:18:09 -0800
commit19420e6c2592e8a31e2ead4bccebc1a9ccca52b1 (patch)
tree6ac663124923fb88d3337315f87fd3fc08e12801 /src/mesa
parent1d0ddea92fc933d623caf1b9d3bda47b6f8296f8 (diff)
[915] Revert broken context creation change from IS_915 commit.
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.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index d91bb38e30..2392c2c49c 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -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);
}