summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Girlin <vadimgirlin@gmail.com>2011-10-06 09:04:41 +0400
committerAlex Deucher <alexander.deucher@amd.com>2011-11-14 11:11:31 -0500
commitdcdc062dda62212d09f522e07530ed79871ba481 (patch)
treef2d0ea11f9adc891fbe5ddb5f553df29c49c51e2
parentebecbbc2e68673a49c3d0394c2f591f7a605110f (diff)
r600g: fix op3 & write in merge_inst_groups
-rw-r--r--src/gallium/drivers/r600/r600_asm.c2
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 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. */