From: Jason Ekstrand Date: Mon, 21 Jan 2019 22:35:25 +0000 (-0600) Subject: nir: Mark deref UBO and SSBO access as non-scalar X-Git-Tag: upstream/19.0.0~415 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca8c6c97814043644b4513a8ca79c3d2af2ed7ef;p=platform%2Fupstream%2Fmesa.git nir: Mark deref UBO and SSBO access as non-scalar Fixes: 63b9aa2e2574 "spirv: Add support for using derefs for..." Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/compiler/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index 3d7155c..41ae19e 100644 --- a/src/compiler/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c @@ -86,7 +86,9 @@ is_phi_src_scalarizable(nir_phi_src *src, case nir_intrinsic_load_deref: { nir_deref_instr *deref = nir_src_as_deref(src_intrin->src[0]); return deref->mode == nir_var_shader_in || - deref->mode == nir_var_uniform; + deref->mode == nir_var_uniform || + deref->mode == nir_var_mem_ubo || + deref->mode == nir_var_mem_ssbo; } case nir_intrinsic_interp_deref_at_centroid: