Module: Mesa Branch: master Commit: 19fda9fc8336795b9898d3773b05549238b72bd0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19fda9fc8336795b9898d3773b05549238b72bd0
Author: Ian Romanick <[email protected]> Date: Thu Mar 5 10:27:04 2015 -0800 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]> --- src/mesa/drivers/dri/i915/intel_chipset.h | 3 --- 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
