From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 21 Sep 2022 16:19:24 +0000 (-0400)
Subject: zink: always run optimize_nir after lower_64bit_vars
X-Git-Tag: upstream/22.3.5~2267
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f053f0f07cb28a50faa6732430f08e8ba368900;p=platform%2Fupstream%2Fmesa.git

zink: always run optimize_nir after lower_64bit_vars

it's otherwise possible (and likely) that optimizations won't
happen since there's no shader key data active

Fixes: 5b2f850425e ("zink: rewrite 64bit shader i/o as 32bit")

SoroushIMG <soroush.kashani@imgtec.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18728>
---

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index f808f96..1032e74 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -1874,6 +1874,7 @@ lower_64bit_vars(nir_shader *shader)
    if (progress) {
       nir_lower_alu_to_scalar(shader, filter_64_bit_instr, NULL);
       nir_lower_phis_to_scalar(shader, false);
+      optimize_nir(shader, NULL);
    }
    return progress;
 }