summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-08-07 12:05:35 -0700
committerIan Romanick <[email protected]>2012-08-13 17:23:24 -0700
commit2b636243265f0f09b7fd8d42046119222a63cad4 (patch)
tree3916ed54d809e5ae0f89d2da48f58c28b74e9413 /src
parent70f47505a2e5d4cf949b7c2650f3d9f6559bacb3 (diff)
intel: In the i915 driver, the chipset cannot be i965
In the i965 dirver, the chipset must be i965. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index f3592af621a..cdae702adf5 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -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) {