From: Christian König <deathsimple@vodafone.de>
Date: Wed, 22 Dec 2010 19:50:16 +0000 (+0100)
Subject: r600g: remove some unneded barriers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b03996b1269fb8b2f89e0a013d8427da660ff83;p=mesa.git

r600g: remove some unneded barriers
---

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 1cd0f4cdcfd..491086eea87 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -1485,21 +1485,21 @@ void r600_cf_vtx(struct r600_vertex_element *ve, u32 *bytecode, unsigned count)
 	if (count > 8) {
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(8 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT(8 - 1);
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(40 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT(count - 8 - 1);
 	} else {
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(8 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT(count - 1);
 	}
 	bytecode[i++] = S_SQ_CF_WORD0_ADDR(0);
 	bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_RETURN) |
-			S_SQ_CF_WORD1_BARRIER(1);
+			S_SQ_CF_WORD1_BARRIER(0);
 
 	rstate = &ve->rstate;
 	rstate->id = R600_PIPE_STATE_FETCH_SHADER;
@@ -1521,21 +1521,21 @@ void r600_cf_vtx_tc(struct r600_vertex_element *ve, u32 *bytecode, unsigned coun
 	if (count > 8) {
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(8 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX_TC) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT(8 - 1);
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(40 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX_TC) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT((count - 8) - 1);
 	} else {
 		bytecode[i++] = S_SQ_CF_WORD0_ADDR(8 >> 1);
 		bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_VTX_TC) |
-						S_SQ_CF_WORD1_BARRIER(1) |
+						S_SQ_CF_WORD1_BARRIER(0) |
 						S_SQ_CF_WORD1_COUNT(count - 1);
 	}
 	bytecode[i++] = S_SQ_CF_WORD0_ADDR(0);
 	bytecode[i++] = S_SQ_CF_WORD1_CF_INST(V_SQ_CF_WORD1_SQ_CF_INST_RETURN) |
-			S_SQ_CF_WORD1_BARRIER(1);
+			S_SQ_CF_WORD1_BARRIER(0);
 
 	rstate = &ve->rstate;
 	rstate->id = R600_PIPE_STATE_FETCH_SHADER;
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index f2e74c9cee2..80972b04ab0 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -603,7 +603,7 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
 		output[i].swizzle_y = 1;
 		output[i].swizzle_z = 2;
 		output[i].swizzle_w = 3;
-		output[i].barrier = 1;
+		output[i].barrier = i == 0;
 		output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
 		output[i].array_base = i - pos0;
 		output[i].inst = BC_INST(ctx.bc, V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT);