From a7760e4bd805b3076d6a916a4cb67c01fbd01d2e Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 28 May 2025 19:57:20 -0400
Subject: [PATCH] nak: Set MemOrder::Constant for CAN_REORDER image loads on
 all hardware

On Turing and Volta, it will safely degrade suld.weak.  On Maxwell and
Pascal, it will degrade to suld.cta.

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

diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs
index a63098416f8..c44ab2857ad 100644
--- a/src/nouveau/compiler/nak/from_nir.rs
+++ b/src/nouveau/compiler/nak/from_nir.rs
@@ -2690,11 +2690,7 @@ impl<'a> ShaderFromNir<'a> {
                 // let sample = self.get_src(&srcs[2]);
 
                 let mem_order = if (intrin.access() & ACCESS_CAN_REORDER) != 0 {
-                    if self.sm.sm() >= 80 {
-                        MemOrder::Constant
-                    } else {
-                        MemOrder::Weak
-                    }
+                    MemOrder::Constant
                 } else {
                     MemOrder::Strong(MemScope::GPU)
                 };
@@ -2727,11 +2723,7 @@ impl<'a> ShaderFromNir<'a> {
                 // let sample = self.get_src(&srcs[2]);
 
                 let mem_order = if (intrin.access() & ACCESS_CAN_REORDER) != 0 {
-                    if self.sm.sm() >= 80 {
-                        MemOrder::Constant
-                    } else {
-                        MemOrder::Weak
-                    }
+                    MemOrder::Constant
                 } else {
                     MemOrder::Strong(MemScope::GPU)
                 };