From: Dave Airlie <airlied@redhat.com>
Date: Tue, 24 Feb 2015 05:57:49 +0000 (+1000)
Subject: r600: add alu + cf nop to copy shader on r600
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13b134a443744e0a1d25d37a1e819d6737aca4a2;p=mesa.git

r600: add alu + cf nop to copy shader on r600

SB suggests we do this for r600, so lets do it,
for the copy shader.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 9fe20b02861..fe4a27d36ff 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1613,6 +1613,16 @@ static int generate_gs_copy_shader(struct r600_context *rctx,
 		cshader->shader.ring_item_sizes[ring] = ocnt * 16;
 	}
 
+	/* bc adds nops - copy it */
+	if (ctx.bc->chip_class == R600) {
+		memset(&alu, 0, sizeof(struct r600_bytecode_alu));
+		alu.op = ALU_OP0_NOP;
+		alu.last = 1;
+		r600_bytecode_add_alu(ctx.bc, &alu);
+
+		r600_bytecode_add_cfinst(ctx.bc, CF_OP_NOP);
+	}
+
 	/* export vertex data */
 	/* XXX factor out common code with r600_shader_from_tgsi ? */
 	for (i = 0; i < ocnt; ++i) {