Mesa (master): anv/nir_apply_pipeline_layout: Pass the nir_src from the nir_tex_src

Eduardo Lima Mitev elima at kemper.freedesktop.org
Sat May 21 17:58:25 UTC 2016


Module: Mesa
Branch: master
Commit: 7dce4793b7fae65a2ecb63681c5096fb2af2eec4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dce4793b7fae65a2ecb63681c5096fb2af2eec4

Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Sat May 21 09:24:03 2016 +0200

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 <jason at jlekstrand.net>

---

 src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {




More information about the mesa-commit mailing list