Mesa (7.10): r300/compiler: Don't erase sources when converting RGB->Alpha

Tom Stellard tstellar at kemper.freedesktop.org
Sat Feb 12 04:27:12 UTC 2011


Module: Mesa
Branch: 7.10
Commit: cc1636b6db85604510f97f8a37d7fd0ecf453866
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc1636b6db85604510f97f8a37d7fd0ecf453866

Author: Tom Stellard <tstellar at gmail.com>
Date:   Wed Feb  9 01:43:29 2011 -0800

r300/compiler: Don't erase sources when converting RGB->Alpha

https://bugs.freedesktop.org/show_bug.cgi?id=34030

(cherry picked from commit 9106b98766e36b04daf738bd81c4f86eedfa1b8d)

---

 .../dri/r300/compiler/radeon_pair_schedule.c       |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
index 9beb5d6..1a1e881 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -544,18 +544,12 @@ static void rgb_to_alpha_remap (
 {
 	int new_src_index;
 	unsigned int i;
-	struct rc_pair_instruction_source * old_src =
-					rc_pair_get_src(&inst->U.P, arg);
-	if (!old_src) {
-		return;
-	}
 
 	for (i = 0; i < 3; i++) {
 		if (get_swz(arg->Swizzle, i) == old_swz) {
 			SET_SWZ(arg->Swizzle, i, RC_SWIZZLE_W);
 		}
 	}
-	memset(old_src, 0, sizeof(struct rc_pair_instruction_source));
 	new_src_index = rc_pair_alloc_source(&inst->U.P, 0, 1,
 							old_file, new_index);
 	/* This conversion is not possible, we must have made a mistake in




More information about the mesa-commit mailing list