diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c b/src/mesa/drivers/dri/i965/brw_clip_util.c index fc484a7..94cd626 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_util.c +++ b/src/mesa/drivers/dri/i965/brw_clip_util.c @@ -343,7 +343,7 @@ void brw_clip_init_clipmask( struct brw_clip_compile *c ) release_tmp(c, tmp); } - if (BRW_IS_IGD(p->brw)) { + if (BRW_IS_IGD(p->brw) || BRW_IS_965(p->brw)) { /* Test for -ve rhw workaround */ brw_set_conditionalmod(p, BRW_CONDITIONAL_NZ); diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 101828b..4cd805a 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -849,6 +849,10 @@ #define R02_PRIM_START 0x2 #define BRW_IS_IGD(brw) ((brw)->intel.intelScreen->deviceID == PCI_CHIP_IGD_GM) +#define BRW_IS_965(brw) ((brw)->intel.intelScreen->deviceID == PCI_CHIP_I965_G || \ + (brw)->intel.intelScreen->deviceID == PCI_CHIP_I965_Q || \ + (brw)->intel.intelScreen->deviceID == PCI_CHIP_I965_G_1 || \ + (brw)->intel.intelScreen->deviceID == PCI_CHIP_I965_GM) #define CMD_PIPELINE_SELECT(brw) ((BRW_IS_IGD(brw)) ? CMD_PIPELINE_SELECT_IGD : CMD_PIPELINE_SELECT_965) #define CMD_VF_STATISTICS(brw) ((BRW_IS_IGD(brw)) ? CMD_VF_STATISTICS_IGD : CMD_VF_STATISTICS_965) #define URB_SIZES(brw) ((BRW_IS_IGD(brw)) ? 384 : 256) /* 512 bit unit */