From 884d2021d9a1950ed9a77ee21db0af911a0c5b1b Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 19 Aug 2020 11:30:19 -0500 Subject: [PATCH] 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 Part-of: --- 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; -- 2.30.2