From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 8 Mar 2022 17:12:21 +0000 (-0500)
Subject: zink: run nir_lower_phis_to_scalar in optimization loop
X-Git-Tag: upstream/22.3.5~11957
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9579df6a7ffc2116623cd3d2d9517dabe770cfe4;p=platform%2Fupstream%2Fmesa.git

zink: run nir_lower_phis_to_scalar in optimization loop

fixes (lavapipe):
dEQP-GLES3.functional.shaders.switch.switch_in_do_while_loop_dynamic*

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15274>
---

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index ec6aef0..46869b6 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -387,6 +387,7 @@ optimize_nir(struct nir_shader *s)
       NIR_PASS(progress, s, nir_opt_remove_phis);
       NIR_PASS(progress, s, nir_opt_dce);
       NIR_PASS(progress, s, nir_opt_dead_cf);
+      NIR_PASS(progress, s, nir_lower_phis_to_scalar, false);
       NIR_PASS(progress, s, nir_opt_cse);
       NIR_PASS(progress, s, nir_opt_peephole_select, 8, true, true);
       NIR_PASS(progress, s, nir_opt_algebraic);