i915: Remove IS_9XX macro

Since the i915 / i965 split, IS_9XX just means IS_GEN3.  Inspired by
Damien's recent libdrm changes.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index d05fd08c793e1e0ff23bf2ad35a57467b431dfff..f7c8b5df4e63fe5d558b707dfdec6f55106aa77b 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_chipset.h
+++ b/src/mesa/drivers/dri/i915/intel_chipset.h
@@ -64,9 +64,6 @@
                                 devid == PCI_CHIP_Q33_G || \
                                 devid == PCI_CHIP_Q35_G || IS_PNV(devid))
 
-#define IS_9XX(devid)          (IS_915(devid) || \
-                                IS_945(devid))
-
 #define IS_GEN3(devid)         (IS_915(devid) ||       \
                                 IS_945(devid))
 

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 00d85805da08395780e08af66f3146926af99184..77af328bfed7772f799241e860352f81d1fe2919 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -969,7 +969,7 @@ intelCreateContext(gl_api api,
       return false;
    }
 
-   if (IS_9XX(intelScreen->deviceID)) {
+   if (IS_GEN3(intelScreen->deviceID)) {
       success = i915CreateContext(api, mesaVis, driContextPriv,
                                   major_version, minor_version, flags,
                                   error, sharedContextPrivate);
@@ -1177,7 +1177,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
 
    intelScreen->deviceID = drm_intel_bufmgr_gem_get_devid(intelScreen->bufmgr);
 
-   if (IS_9XX(intelScreen->deviceID)) {
+   if (IS_GEN3(intelScreen->deviceID)) {
       intelScreen->gen = 3;
    } else {
       intelScreen->gen = 2;