Mesa (master): r600g: fix op3 & write in merge_inst_groups

Alex Deucher agd5f at kemper.freedesktop.org
Mon Nov 14 16:33:15 UTC 2011


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

Author: Vadim Girlin <vadimgirlin at gmail.com>
Date:   Thu Oct  6 09:04:41 2011 +0400

r600g: fix op3 & write in merge_inst_groups

---

 src/gallium/drivers/r600/r600_asm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index add1276..72c11dc 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. */




More information about the mesa-commit mailing list