From 498afcdb884540cd6187b7fb687a1e09a887a0f1 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 2 Oct 2023 17:49:28 -0500
Subject: [PATCH] HACK: Only emit OpBar in compute shaders

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak_from_nir.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs
index 8bdd5d4bcf3..d45efa13013 100644
--- a/src/nouveau/compiler/nak_from_nir.rs
+++ b/src/nouveau/compiler/nak_from_nir.rs
@@ -1774,7 +1774,9 @@ impl<'a> ShaderFromNir<'a> {
                     SCOPE_NONE => (),
                     SCOPE_WORKGROUP => {
                         b.push_op(OpWarpSync { mask: u32::MAX });
-                        b.push_op(OpBar {}).deps.yld = true;
+                        if self.nir.info.stage() == MESA_SHADER_COMPUTE {
+                            b.push_op(OpBar {}).deps.yld = true;
+                        }
                     }
                     _ => panic!("Unhandled execution scope"),
                 }