Attachment 51859 Details for Bug 41367 – Possible fix

[patch] Possible fix

webgl-fix.patch (text/plain), 2.90 KB, created by Tom Stellard on 2011-10-01 15:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2011-10-01 15:16:03 UTC

Size: 2.90 KB

patch

obsolete

>diff --git a/src/gallium/drivers/r300/compiler/radeon_compiler_util.c b/src/gallium/drivers/r300/compiler/radeon_compiler_util.c
>index 33dbe0e..1ee0c35 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);
> }
> 
> /**
>diff --git a/src/gallium/drivers/r300/compiler/radeon_optimize.c b/src/gallium/drivers/r300/compiler/radeon_optimize.c
>index 7df9681..2d799a6 100644
>--- a/src/gallium/drivers/r300/compiler/radeon_optimize.c
>+++ b/src/gallium/drivers/r300/compiler/radeon_optimize.c
>@@ -681,6 +681,20 @@ static void omod_filter_reader_cb(
> 	}
> }
> 
>+static void omod_filter_writer_cb(
>+	void * userdata,
>+	struct rc_instruction * inst,
>+	rc_register_file file,
>+	unsigned int index,
>+	unsigned int mask)
>+{
>+	struct peephole_mul_cb_data * d = userdata;
>+	if (file == d->Writer->File && index == d->Writer->Index &&
>+					(mask & d->Writer->WriteMask)) {
>+		d->Clobbered = 1;
>+	}
>+}
>+
> static int peephole_mul_omod(
> 	struct radeon_compiler * c,
> 	struct rc_instruction * inst_mul,
>@@ -788,6 +802,8 @@ static int peephole_mul_omod(
> 							inst = inst->Prev) {
> 			rc_for_all_reads_mask(inst, omod_filter_reader_cb,
> 								&cb_data);
>+			rc_for_all_writes_mask(inst, omod_filter_writer_cb,
>+								&cb_data);
> 			if (cb_data.Clobbered) {
> 				break;
> 			}
>@@ -801,8 +817,13 @@ static int peephole_mul_omod(
> 	/* Rewrite the instructions */
> 	for (var = writer_list->Item; var; var = var->Friend) {
> 		struct rc_variable * writer = writer_list->Item;
>+		unsigned conversion_swizzle = rc_make_conversion_swizzle(
>+					writer->Inst->U.I.DstReg.WriteMask,
>+					inst_mul->U.I.DstReg.WriteMask);
> 		writer->Inst->U.I.Omod = omod_op;
>-		writer->Inst->U.I.DstReg = inst_mul->U.I.DstReg;
>+		writer->Inst->U.I.DstReg.File = inst_mul->U.I.DstReg.File;
>+		writer->Inst->U.I.DstReg.Index = inst_mul->U.I.DstReg.Index;
>+		rc_normal_rewrite_writemask(writer->Inst, conversion_swizzle);
> 		writer->Inst->U.I.SaturateMode = inst_mul->U.I.SaturateMode;
> 	}
>

Actions: View | Splinter Review

Attachments on bug 41367: 51859

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.