From 86f21e4eba7ad980109f13bd5480c02593ca19fe Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 3 Jun 2020 14:35:02 +0200 Subject: [PATCH] nir/lower_explicit_io: fix NON_UNIFORM access for UBO loads Make sure to propagate the NON_UNIFORM access for UBO loads, so that non-uniform loads are correctly lowered. Cc: Signed-off-by: Samuel Pitoiset Reviewed-by: Rhys Perry Part-of: --- src/compiler/nir/nir_lower_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index c127802a59d..e45fffbcf9e 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -911,7 +911,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin, load->src[1] = nir_src_for_ssa(addr_to_offset(b, addr, addr_format)); } - if (mode != nir_var_mem_ubo && mode != nir_var_shader_in && mode != nir_var_mem_shared) + if (mode != nir_var_shader_in && mode != nir_var_mem_shared) nir_intrinsic_set_access(load, nir_intrinsic_access(intrin)); unsigned bit_size = intrin->dest.ssa.bit_size; -- 2.30.2