KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ian Romanick 2015-03-05 10:27:04 -08:00
parent 6d41316b79
commit 19fda9fc83
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/drivers/dri/i915/intel_chipset.h
View File

@ -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))

4
src/mesa/drivers/dri/i915/intel_screen.c
View File

@ -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;