From: Eduardo Lima Mitev Date: Sat, 21 May 2016 07:24:03 +0000 (+0200) Subject: anv/nir_apply_pipeline_layout: Pass the nir_src from the nir_tex_src X-Git-Tag: upstream/17.1.0~9593 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dce4793b7fae65a2ecb63681c5096fb2af2eec4;p=platform%2Fupstream%2Fmesa.git anv/nir_apply_pipeline_layout: Pass the nir_src from the nir_tex_src nir_instr_rewrite_src() expects a nir_src and it is currently being fed a nir_tex_src. This will crash something. Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index ddb099e..6481269 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -163,7 +163,7 @@ lower_tex_deref(nir_tex_instr *tex, nir_deref_var *deref, * first-class texture source. */ tex->src[tex->num_srcs].src_type = src_type; - nir_instr_rewrite_src(&tex->instr, &tex->src[tex->num_srcs], + nir_instr_rewrite_src(&tex->instr, &tex->src[tex->num_srcs].src, nir_src_for_ssa(index)); tex->num_srcs++; } else {