From 5df68ffac10ebe0cc950d5c5c2e6f7462acf916e Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 26 Mar 2025 17:35:12 -0500
Subject: [PATCH] nak: Check num_regs(UGPR) instead of SM version

This is more explicit and leaves fewer naked version numbers in the
code.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34201>
---
 src/nouveau/compiler/nak/from_nir.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs
index 167f149f768..c308e7b273d 100644
--- a/src/nouveau/compiler/nak/from_nir.rs
+++ b/src/nouveau/compiler/nak/from_nir.rs
@@ -3410,7 +3410,7 @@ impl<'a> ShaderFromNir<'a> {
             }
 
             let uniform = !nb.divergent
-                && self.sm.sm() >= 75
+                && self.sm.num_regs(RegFile::UGPR) > 0
                 && !DEBUG.no_ugpr()
                 && !np.def.divergent;
 
@@ -3459,7 +3459,7 @@ impl<'a> ShaderFromNir<'a> {
             }
 
             let uniform = !nb.divergent
-                && self.sm.sm() >= 75
+                && self.sm.num_regs(RegFile::UGPR) > 0
                 && !DEBUG.no_ugpr()
                 && ni.def().is_some_and(|d| !d.divergent);
             let mut b = UniformBuilder::new(&mut b, uniform);