diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-03-05 10:27:04 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-03-09 14:08:57 -0700 |
| commit | 19fda9fc8336795b9898d3773b05549238b72bd0 (patch) | |
| tree | 63a9655e2a9a970196872f183926e1080caeb7c8 /src/mesa | |
| parent | 6d41316b79cf6d67bcbd155dfb6556e2977080d5 (diff) | |
| download | external_mesa3d-19fda9fc8336795b9898d3773b05549238b72bd0.zip external_mesa3d-19fda9fc8336795b9898d3773b05549238b72bd0.tar.gz external_mesa3d-19fda9fc8336795b9898d3773b05549238b72bd0.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_chipset.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 4 |
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 d05fd08..f7c8b5d 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 00d8580..77af328 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; |