From: Vadim Girlin <vadimgirlin@gmail.com>
Date: Thu, 6 Oct 2011 05:04:41 +0000 (+0400)
Subject: r600g: fix op3 & write in merge_inst_groups
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dcdc062dda62212d09f522e07530ed79871ba481;p=mesa.git

r600g: fix op3 & write in merge_inst_groups
---

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index add1276e5dc..72c11dc44eb 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -1045,7 +1045,7 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
 				continue;
 
 			for (j = 0; j < max_slots; ++j) {
-				if (!prev[j] || !prev[j]->dst.write)
+				if (!prev[j] || !(prev[j]->dst.write || prev[j]->is_op3))
 					continue;
 
 				/* If it's relative then we can't determin which gpr is really used. */