From aac97b22ae8d5a06646a3cef373c78c2f005f2cb Mon Sep 17 00:00:00 2001
From: M Henning <drawoc@darkrefraction.com>
Date: Sat, 13 Jul 2024 16:15:25 -0400
Subject: [PATCH] nak: Don't mix up two types of barrier

This part of the shader header is used for control flow barriers (like
glsl barrier()), not reconvergence barriers.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30180>
---
 src/nouveau/compiler/nak/assign_regs.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/nouveau/compiler/nak/assign_regs.rs b/src/nouveau/compiler/nak/assign_regs.rs
index 112c47dcc22..81d70b4f104 100644
--- a/src/nouveau/compiler/nak/assign_regs.rs
+++ b/src/nouveau/compiler/nak/assign_regs.rs
@@ -1359,13 +1359,6 @@ impl Shader<'_> {
 
         self.info.num_gprs = total_gprs.try_into().unwrap();
 
-        // We do a maximum here because nak_from_nir may set num_barriers to 1
-        // in the case where there is an OpBar.
-        self.info.num_barriers = max(
-            self.info.num_barriers,
-            max_live[RegFile::Bar].try_into().unwrap(),
-        );
-
         let limit = PerRegFile::new_with(|file| {
             if file == RegFile::GPR {
                 gpr_limit