summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_chipset.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-02-15 14:52:58 -0500
committerAdam Jackson <ajax@redhat.com>2008-02-15 14:52:58 -0500
commitcf0d91ae1d627381b632de63e5cb85494b277eb4 (patch)
treec339ad5d6a3431947af79ce3fedf7c49d6390e68 /src/mesa/drivers/dri/intel/intel_chipset.h
parentc51eb3ec401e78dd14ccd95304599909045b17b6 (diff)
Add IS_915(), simplify IS_9XX() a bit.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_chipset.h')
-rw-r--r--src/mesa/drivers/dri/intel/intel_chipset.h29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
index 168dc724db..3c8fd2384e 100644
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -65,6 +65,17 @@
#define IS_IGD(devid) (devid == PCI_CHIP_IGD_GM)
+#define IS_915(devid) (devid == PCI_CHIP_I915_G || \
+ devid == PCI_CHIP_E7221_G || \
+ devid == PCI_CHIP_I915_GM)
+
+#define IS_945(devid) (devid == PCI_CHIP_I945_G || \
+ devid == PCI_CHIP_I945_GM || \
+ devid == PCI_CHIP_I945_GME || \
+ devid == PCI_CHIP_G33_G || \
+ devid == PCI_CHIP_Q33_G || \
+ devid == PCI_CHIP_Q35_G)
+
#define IS_965(devid) (devid == PCI_CHIP_I965_G || \
devid == PCI_CHIP_I965_Q || \
devid == PCI_CHIP_I965_G_1 || \
@@ -73,20 +84,6 @@
devid == PCI_CHIP_I946_GZ || \
IS_IGD(devid))
-#define IS_9XX(devid) (devid == PCI_CHIP_I915_G || \
- devid == PCI_CHIP_E7221_G || \
- devid == PCI_CHIP_I915_GM || \
- devid == PCI_CHIP_I945_G || \
- devid == PCI_CHIP_I945_GM || \
- devid == PCI_CHIP_I945_GME || \
- devid == PCI_CHIP_G33_G || \
- devid == PCI_CHIP_Q35_G || \
- devid == PCI_CHIP_Q33_G || \
+#define IS_9XX(devid) (IS_915(devid) || \
+ IS_945(devid) || \
IS_965(devid))
-
-#define IS_945(devid) (devid == PCI_CHIP_I945_G || \
- devid == PCI_CHIP_I945_GM || \
- devid == PCI_CHIP_I945_GME || \
- devid == PCI_CHIP_G33_G || \
- devid == PCI_CHIP_Q33_G || \
- devid == PCI_CHIP_Q35_G)