clover/nir: Stop computing the global address format twice

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6367>

diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp
index 290d92ec22c0b4364c205609733741fd97d50716..713ab3c48770e214e27984a07d5ceed66440940e 100644 (file)
--- a/src/gallium/frontends/clover/nir/invocation.cpp
+++ b/src/gallium/frontends/clover/nir/invocation.cpp
@@ -153,10 +153,8 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev,
          nir_var_mem_shared);
       NIR_PASS_V(nir, nir_lower_explicit_io, modes, nir_address_format_32bit_offset);
 
-      /* use global format for global memory */
-      nir_address_format format = nir->info.cs.ptr_size == 64 ?
-         nir_address_format_64bit_global : nir_address_format_32bit_global;
-      NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_global, format);
+      NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_global,
+                 spirv_options.global_addr_format);
 
       NIR_PASS_V(nir, nir_lower_system_values);
       if (compiler_options->lower_int64_options)