summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2015-03-05 10:27:04 -0800
committerIan Romanick <[email protected]>2015-03-09 14:08:57 -0700
commit19fda9fc8336795b9898d3773b05549238b72bd0 (patch)
tree63a9655e2a9a970196872f183926e1080caeb7c8
parent6d41316b79cf6d67bcbd155dfb6556e2977080d5 (diff)
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 <[email protected]> Reviewed-by: Damien Lespiau <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i915/intel_chipset.h3
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index d05fd08c793..f7c8b5df4e6 100644
--- 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 00d85805da0..77af328bfed 100644
--- 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;