summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2011-10-01 15:18:18 -0700
committerTom Stellard <[email protected]>2011-10-02 15:21:15 -0700
commit8b0418e478f9def2783060d90d1b267a54a9c6c3 (patch)
tree83bbfd5c475c2908b811ffad9f44f3f0e0b8e239 /src/gallium/drivers
parentb5ecf5ba466c3e1872dc9281b01f4e59ca1a388b (diff)
r300/compiler: Fix rc_normal_rewrite_writemask()
This function had not been updated to use conversion swizzles.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/r300/compiler/radeon_compiler_util.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/compiler/radeon_compiler_util.c b/src/gallium/drivers/r300/compiler/radeon_compiler_util.c
index 36a634114d6..b609d9fae3c 100644
--- a/src/gallium/drivers/r300/compiler/radeon_compiler_util.c
+++ b/src/gallium/drivers/r300/compiler/radeon_compiler_util.c
@@ -211,8 +211,8 @@ static void normal_rewrite_writemask_cb(
struct rc_instruction * inst,
struct rc_src_register * src)
{
- unsigned int * new_mask = (unsigned int *)userdata;
- src->Swizzle = rc_adjust_channels(src->Swizzle, *new_mask);
+ unsigned int * conversion_swizzle = (unsigned int *)userdata;
+ src->Swizzle = rc_adjust_channels(src->Swizzle, *conversion_swizzle);
}
/**
@@ -223,7 +223,6 @@ void rc_normal_rewrite_writemask(
struct rc_instruction * inst,
unsigned int conversion_swizzle)
{
- unsigned int new_mask;
struct rc_sub_instruction * sub = &inst->U.I;
const struct rc_opcode_info * info = rc_get_opcode_info(sub->Opcode);
sub->DstReg.WriteMask =
@@ -244,8 +243,8 @@ void rc_normal_rewrite_writemask(
return;
}
- new_mask = sub->DstReg.WriteMask;
- rc_for_all_reads_src(inst, normal_rewrite_writemask_cb, &new_mask);
+ rc_for_all_reads_src(inst, normal_rewrite_writemask_cb,
+ &conversion_swizzle);
}
/**