From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Fri, 11 Oct 2019 19:36:49 +0000 (-0700)
Subject: freedreno/ir3: Start GS with (ss) and (sy)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b7312b763b1417374ee5ce84c0bdb1f120e5d44;p=mesa.git

freedreno/ir3: Start GS with (ss) and (sy)

We don't know what kind of loads we might have to wait on when coming
in from chsh in the VS so set both sync flags.

Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>
---

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 1924b0a5493..aa9479ff2dc 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3255,6 +3255,19 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler,
 		ir3_print(ir);
 	}
 
+	/* Set (ss)(sy) on first TCS and GEOMETRY instructions, since we don't
+	 * know what we might have to wait on when coming in from VS chsh.
+	 */
+	if (so->type == MESA_SHADER_TESS_CTRL ||
+		so->type == MESA_SHADER_GEOMETRY ) {
+		list_for_each_entry (struct ir3_block, block, &ir->block_list, node) {
+			list_for_each_entry (struct ir3_instruction, instr, &block->instr_list, node) {
+				instr->flags |= IR3_INSTR_SS | IR3_INSTR_SY;
+				break;
+			}
+		}
+	}
+
 	so->branchstack = ctx->max_stack;
 
 	/* Note that actual_in counts inputs that are not bary.f'd for FS: */