commit c256cd900e71a44490ed8a248ebc0c7f1abc38c5
author Jason Ekstrand <jason@jlekstrand.net> Tue Jul 21 18:46:24 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Wed Jul 29 17:38:58 2020 +0000
tree d319342992ebbaf03d36c1ffe2fa2b79d3c4c632
parent 4d7e064623ea4db1e5e18e18b0bb958462054ed3

nir/lower_variable_initializers: Restrict the modes we lower

This is not a functional change because these are the only modes we
handle.  All others get silently ignored.

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

src/compiler/nir/nir_lower_variable_initializers.c

diff --git a/src/compiler/nir/nir_lower_variable_initializers.c b/src/compiler/nir/nir_lower_variable_initializers.c
index 3a32bbd..7b90a19 100644
--- a/src/compiler/nir/nir_lower_variable_initializers.c
+++ b/src/compiler/nir/nir_lower_variable_initializers.c
@@ -88,6 +88,16 @@
 {
    bool progress = false;
 
+   /* Only some variables have initializers that we want to lower.  Others
+    * such as uniforms have initializers which are useful later during linking
+    * so we want to skip over those.  Restrict to only variable types where
+    * initializers make sense so that callers can use nir_var_all.
+    */
+   modes &= nir_var_shader_out |
+            nir_var_shader_temp |
+            nir_var_function_temp |
+            nir_var_system_value;
+
    nir_foreach_function(function, shader) {
       if (!function->impl)
 	 continue;