From 526f3566332e6fdf3bc413471a1a6e5ad091f0c5 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 21 Aug 2020 17:23:59 -0500 Subject: [PATCH] clover: Use 64-bit offsets for shader_in on 64-bit GPUs This really shouldn't matter as inputs should have logical pointers. However, nir_builder defaults to building derefs based on the pointer size in the shader_info. It's easier for now to just be consistent everywhere. Reviewed-by: Karol Herbst Part-of: --- src/gallium/frontends/clover/nir/invocation.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/frontends/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp index 92465143333..8ea6d3cf4d0 100644 --- a/src/gallium/frontends/clover/nir/invocation.cpp +++ b/src/gallium/frontends/clover/nir/invocation.cpp @@ -231,8 +231,10 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev, nir_var_mem_shared | nir_var_function_temp, glsl_get_cl_type_size_align); - /* use offsets for uniform and shared memory */ + /* use offsets for kernel inputs (uniform) */ NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_uniform, + nir->info.cs.ptr_size == 64 ? + nir_address_format_32bit_offset_as_64bit : nir_address_format_32bit_offset); NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_constant, -- 2.30.2