summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_eu_emit.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_eu_emit.c
parentd758c48761a2be2a6c9b3d80f8fe06d32b5dd0d3 (diff)
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_eu_emit.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_eu_emit.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 58d97465d1..ce4cf46cfa 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -333,14 +333,14 @@ static void brw_set_sampler_message(struct brw_context *brw,
{
brw_set_src1(insn, brw_imm_d(0));
- if (BRW_IS_GM45(brw) || BRW_IS_G4X(brw)) {
- insn->bits3.sampler_gm45_g4x.binding_table_index = binding_table_index;
- insn->bits3.sampler_gm45_g4x.sampler = sampler;
- insn->bits3.sampler_gm45_g4x.msg_type = msg_type;
- insn->bits3.sampler_gm45_g4x.response_length = response_length;
- insn->bits3.sampler_gm45_g4x.msg_length = msg_length;
- insn->bits3.sampler_gm45_g4x.end_of_thread = eot;
- insn->bits3.sampler_gm45_g4x.msg_target = BRW_MESSAGE_TARGET_SAMPLER;
+ if (BRW_IS_G4X(brw)) {
+ insn->bits3.sampler_g4x.binding_table_index = binding_table_index;
+ insn->bits3.sampler_g4x.sampler = sampler;
+ insn->bits3.sampler_g4x.msg_type = msg_type;
+ insn->bits3.sampler_g4x.response_length = response_length;
+ insn->bits3.sampler_g4x.msg_length = msg_length;
+ insn->bits3.sampler_g4x.end_of_thread = eot;
+ insn->bits3.sampler_g4x.msg_target = BRW_MESSAGE_TARGET_SAMPLER;
} else {
insn->bits3.sampler.binding_table_index = binding_table_index;
insn->bits3.sampler.sampler = sampler;