From d3aca1a75868cb3c184509bcdffddc2b9310a6ce Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Tue, 23 May 2023 13:41:59 -0400
Subject: [PATCH] ttn: Emit scoped barriers when needed

As we start converting more backends over.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23191>
---
 src/gallium/auxiliary/nir/tgsi_to_nir.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 609adb96c15..b8f1fe75545 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1127,7 +1127,10 @@ ttn_ucmp(nir_builder *b, nir_op op, nir_alu_dest dest, nir_ssa_def **src)
 static void
 ttn_barrier(nir_builder *b)
 {
-   nir_control_barrier(b);
+   if (b->shader->options->use_scoped_barrier)
+      nir_scoped_barrier(b, .execution_scope = NIR_SCOPE_WORKGROUP);
+   else
+      nir_control_barrier(b);
 }
 
 static void