From 130392e7abe3761791c295764621963a1f9c5873 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Fri, 7 Jun 2024 21:08:09 -0500
Subject: [PATCH] nak/ra: Never move uniform regs in non-uniform blocks

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

diff --git a/src/nouveau/compiler/nak/assign_regs.rs b/src/nouveau/compiler/nak/assign_regs.rs
index d265a88e79e..0398b678e92 100644
--- a/src/nouveau/compiler/nak/assign_regs.rs
+++ b/src/nouveau/compiler/nak/assign_regs.rs
@@ -1144,6 +1144,13 @@ impl AssignRegsBlock {
                         annotation: "generated by assign_regs".into(),
                     }));
                 }
+                if !b.uniform {
+                    for dst in pcopy.dsts_as_slice() {
+                        if let Dst::Reg(reg) = dst {
+                            assert!(!reg.is_uniform());
+                        }
+                    }
+                }
                 instrs.push(Instr::new_boxed(pcopy));
             }