nir: Fix flat new_var assignment in create_new_io_vars()
authorBoris Brezillon <boris.brezillon@collabora.com>
Wed, 16 Feb 2022 15:55:36 +0000 (16:55 +0100)
committerMarge Bot <emma+marge@anholt.net>
Fri, 10 Jun 2022 08:06:46 +0000 (08:06 +0000)
If the type is not an array, glsl_get_length() returns 0 and we don't
update the new_vars[]/flat_vars[] entries.

Fixes: bcd14756eec ("nir/lower_io_to_vector: add flat mode")
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16960>

src/compiler/nir/nir_lower_io_to_vector.c

index e17f6dd..27913b5 100644 (file)
@@ -304,7 +304,8 @@ create_new_io_vars(nir_shader *shader, nir_variable_mode mode,
             var->type = flat_type;
 
          nir_shader_add_variable(shader, var);
-         for (unsigned i = 0; i < glsl_get_length(flat_type); i++) {
+         unsigned num_slots = MAX2(glsl_get_length(flat_type), 1);
+         for (unsigned i = 0; i < num_slots; i++) {
             for (unsigned j = 0; j < 4; j++)
                new_vars[loc + i][j] = var;
             flat_vars[loc + i] = true;