From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 20 May 2016 23:29:44 +0000 (-0700)
Subject: nir: Fix crash in nir_lower_wpos_center().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7eb95a5269fab015df23dd7c5152418bbd10033;p=mesa.git

nir: Fix crash in nir_lower_wpos_center().

Otherwise we rewrote the fadd to use itself, causing crashes in
validation.  Instead, start after the last use like we should.

A brown paper bag fix.  Fixes crashes in several Vulkan tests.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/compiler/nir/nir_lower_wpos_center.c b/src/compiler/nir/nir_lower_wpos_center.c
index 0de750365d1..7b70af30146 100644
--- a/src/compiler/nir/nir_lower_wpos_center.c
+++ b/src/compiler/nir/nir_lower_wpos_center.c
@@ -54,7 +54,7 @@ add_half_to_fragcoord(nir_builder *b, nir_intrinsic_instr *intr)
    wpos = nir_fadd(b, wpos, nir_imm_vec4(b, 0.5f, 0.5f, 0.0f, 0.0f));
 
    nir_ssa_def_rewrite_uses_after(&intr->dest.ssa, nir_src_for_ssa(wpos),
-                                  &intr->instr);
+                                  wpos->parent_instr);
 }
 
 static bool