Module: Mesa
Branch: master
Commit: 2b636243265f0f09b7fd8d42046119222a63cad4
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b636243265f0f09b7fd8d42046119222a63cad4

Author: Ian Romanick <[email protected]>
Date:   Tue Aug  7 12:05:35 2012 -0700

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]>

---

 src/mesa/drivers/dri/intel/intel_screen.c |   13 +++++--------
 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 f3592af..cdae702 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) {

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to