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 4cee99f15770312f1eaac5f25159b67a070d66e1..692d9d6d7d943d914821963ed3ce15b8f01ad755 100644 (file)
--- 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);