commit d5d15c301e11d623f81a2d9181dadedb03e07c1f
author Jason Ekstrand <jason@jlekstrand.net> Mon Jul 20 17:31:04 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Wed Jul 29 17:38:58 2020 +0000
tree c8289f7e68a49c216cd9cff75b05bb1adddffb7a
parent 3be0be7d545334107977e850ce9ab51b0110a222

nir/lower_amul: Add a variable mode check

This loop should only apply to UBOs and SSBOs because max_slot is never
used for normal uniforms.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5966>

src/compiler/nir/nir_lower_amul.c

diff --git a/src/compiler/nir/nir_lower_amul.c b/src/compiler/nir/nir_lower_amul.c
index 191f204..561cf77 100644
--- a/src/compiler/nir/nir_lower_amul.c
+++ b/src/compiler/nir/nir_lower_amul.c
@@ -236,6 +236,9 @@
    int max_slot = 0;
 
    nir_foreach_variable (var, &shader->uniforms) {
+      if (!(var->data.mode & (nir_var_mem_ubo | nir_var_mem_ssbo)))
+         continue;
+
       int base = var->data.binding;
       int size = MAX2(1, glsl_array_size(var->type));