From fdd6bdf03da507ce333c4ab76fd9f8bbd61c203e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daniel@schuermann.dev>
Date: Wed, 17 Sep 2025 11:04:59 +0200
Subject: [PATCH] ac/nir_lower_global_access: don't assume pack_64_2x32 is the
 same as u2u64

It might also be the expanded base address.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36936>
---
 src/amd/common/nir/ac_nir_lower_global_access.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/amd/common/nir/ac_nir_lower_global_access.c b/src/amd/common/nir/ac_nir_lower_global_access.c
index 0f53df24ab0..3ae97df27e5 100644
--- a/src/amd/common/nir/ac_nir_lower_global_access.c
+++ b/src/amd/common/nir/ac_nir_lower_global_access.c
@@ -8,18 +8,10 @@
 #include "nir.h"
 #include "nir_builder.h"
 
-static bool
+static inline bool
 is_u2u64(nir_scalar scalar)
 {
-   if (nir_scalar_is_alu(scalar) && nir_scalar_alu_op(scalar) == nir_op_u2u64)
-      return true;
-
-   if (nir_scalar_is_alu(scalar) && nir_scalar_alu_op(scalar) == nir_op_pack_64_2x32_split) {
-      nir_scalar src1 = nir_scalar_chase_alu_src(scalar, 1);
-      return nir_scalar_is_const(src1) && nir_scalar_as_uint(src1) == 0;
-   }
-
-   return false;
+   return nir_scalar_is_alu(scalar) && nir_scalar_alu_op(scalar) == nir_op_u2u64;
 }
 
 static nir_def *