summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_clip_tri.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-11-02 12:15:53 -0800
committerEric Anholt <eric@anholt.net>2008-11-02 12:30:00 -0800
commit34b1776e8d965605d12807884c9c447214d57281 (patch)
tree6dbd45ede0b7279c56816a02e243faf700a5b156 /src/mesa/drivers/dri/i965/brw_clip_tri.c
parentd758c48761a2be2a6c9b3d80f8fe06d32b5dd0d3 (diff)
downloadexternal_mesa3d-34b1776e8d965605d12807884c9c447214d57281.zip
external_mesa3d-34b1776e8d965605d12807884c9c447214d57281.tar.gz
external_mesa3d-34b1776e8d965605d12807884c9c447214d57281.tar.bz2
i965: Merge GM45 into the G4X chipset define.
The mobile and desktop chipsets are the same, and having them separate is more typing and more chances to screw up.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_clip_tri.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_clip_tri.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c
index 8459b59..1dbba37 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
@@ -526,7 +526,7 @@ void brw_emit_tri_clip( struct brw_clip_compile *c )
/* if -ve rhw workaround bit is set,
do cliptest */
- if (!(BRW_IS_GM45(p->brw) || BRW_IS_G4X(p->brw))) {
+ if (!BRW_IS_G4X(p->brw)) {
brw_set_conditionalmod(p, BRW_CONDITIONAL_NZ);
brw_AND(p, brw_null_reg(), get_element_ud(c->reg.R0, 2),
brw_imm_ud(1<<20));