From: Paul Berry <stereotype441@gmail.com>
Date: Mon, 22 Jul 2013 22:49:48 +0000 (-0700)
Subject: glsl: don't rename variables in interface block arrays.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=42a921fa92fae8fb8692e7c65c61235588385b3e;p=mesa.git

glsl: don't rename variables in interface block arrays.

The linker matches up variables in interface blocks according to their
block name and variable name.  When support for interface block arrays
was added in commit d6863acb, we renamed variables appearing in
interface blocks so that their name included the array size.  For
example, in a block like this:

out foo {
   float bar
} baz[3];

The variable "bar" would get renamed to "bar[3]".

This is unnecessary, and leads to problems in supporting geometry
shaders, since geometry shaders require vertex shader outputs which
are non-arrays to be linked up to geometry shader inputs which are
arrays.

This patch makes the behaviour of interface block arrays the same as
simple non-array interface blocks; in both cases, the variables
contained within them are not renamed.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/glsl/lower_named_interface_blocks.cpp
index d0d491d3db1..20196a35648 100644
--- a/src/glsl/lower_named_interface_blocks.cpp
+++ b/src/glsl/lower_named_interface_blocks.cpp
@@ -129,9 +129,9 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions)
                                             iface_field_name);
          if (!found_var) {
             ir_variable *new_var;
+            char *var_name =
+               ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name);
             if (array_t == NULL) {
-               char *var_name =
-                  ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name);
                new_var =
                   new(mem_ctx) ir_variable(iface_t->fields.structure[i].type,
                                            var_name,
@@ -141,10 +141,6 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions)
                   glsl_type::get_array_instance(
                      iface_t->fields.structure[i].type,
                      array_t->length);
-               char *var_name =
-                  ralloc_asprintf(mem_ctx, "%s[%d]",
-                                  iface_t->fields.structure[i].name,
-                                  array_t->length);
                new_var =
                   new(mem_ctx) ir_variable(new_array_type,
                                            var_name,