From: Eric Anholt <eric@anholt.net>
Date: Fri, 22 Apr 2016 23:03:07 +0000 (-0700)
Subject: vc4: Scalarize phi nodes as well.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f98bc100d471b0ec7ea50bc3ab05ca118accbec;p=mesa.git

vc4: Scalarize phi nodes as well.

This makes fewer programs with loops assertion fail, replacing them with
the rendering failure warning.
---

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 4cee99f1577..692d9d6d7d9 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -1368,6 +1368,7 @@ vc4_optimize_nir(struct nir_shader *s)
 
                 NIR_PASS_V(s, nir_lower_vars_to_ssa);
                 NIR_PASS_V(s, nir_lower_alu_to_scalar);
+                NIR_PASS_V(s, nir_lower_phis_to_scalar);
 
                 NIR_PASS(progress, s, nir_copy_prop);
                 NIR_PASS(progress, s, nir_opt_dce);