From: Rob Clark <robdclark@gmail.com>
Date: Mon, 15 May 2017 19:38:39 +0000 (-0400)
Subject: nir/lower-atomics-to-ssbo: fix num_components
X-Git-Tag: upstream/18.1.0~9579
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f6c034f82ccc37a0fe2739ee7ebe20ec248c889;p=platform%2Fupstream%2Fmesa.git

nir/lower-atomics-to-ssbo: fix num_components

Fixes some piglits like arb_shader_atomic_counters-active-counters

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
index 27fe50b..23583fd 100644
--- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c
+++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
@@ -155,6 +155,11 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b)
       nir_ssa_def_rewrite_uses(&instr->dest.ssa, nir_src_for_ssa(&new_instr->dest.ssa));
    }
 
+   /* we could be replacing an intrinsic with fixed # of dest num_components
+    * with one that has variable number.  So best to take this from the dest:
+    */
+   new_instr->num_components = instr->dest.ssa.num_components;
+
    return true;
 }