Mesa (master): clover/nir: Stop setting ubo_addr_format

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 884d2021d9a1950ed9a77ee21db0af911a0c5b1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=884d2021d9a1950ed9a77ee21db0af911a0c5b1b

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Aug 19 11:30:19 2020 -0500

clover/nir: Stop setting ubo_addr_format

We unconditionally set constant_as_global = true so we should never get
UBO access out of spirv_to_nir.

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

---

 src/gallium/frontends/clover/nir/invocation.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp
index 8c6b34afc9c..290d92ec22c 100644
--- a/src/gallium/frontends/clover/nir/invocation.cpp
+++ b/src/gallium/frontends/clover/nir/invocation.cpp
@@ -67,12 +67,10 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev,
       spirv_options.shared_addr_format = nir_address_format_32bit_global;
       spirv_options.global_addr_format = nir_address_format_32bit_global;
       spirv_options.temp_addr_format = nir_address_format_32bit_global;
-      spirv_options.ubo_addr_format = nir_address_format_32bit_global;
    } else {
       spirv_options.shared_addr_format = nir_address_format_64bit_global;
       spirv_options.global_addr_format = nir_address_format_64bit_global;
       spirv_options.temp_addr_format = nir_address_format_64bit_global;
-      spirv_options.ubo_addr_format = nir_address_format_32bit_index_offset;
    }
    spirv_options.caps.address = true;
    spirv_options.caps.float64 = true;