From 8b0418e478f9def2783060d90d1b267a54a9c6c3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 1 Oct 2011 15:18:18 -0700 Subject: [PATCH] r300/compiler: Fix rc_normal_rewrite_writemask() This function had not been updated to use conversion swizzles. --- src/gallium/drivers/r300/compiler/radeon_compiler_util.c | 9 ++++----- 1 file 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 36a6341..b609d9f 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); } /** -- 2.7.4