glsl: don't rename variables in interface block arrays.
authorPaul Berry <stereotype441@gmail.com>
Mon, 22 Jul 2013 22:49:48 +0000 (15:49 -0700)
committerPaul Berry <stereotype441@gmail.com>
Thu, 25 Jul 2013 16:34:24 +0000 (09:34 -0700)
commit42a921fa92fae8fb8692e7c65c61235588385b3e
tree2621ea0b8933dd46c9d6bc692f2537c67df9cfa3
parentf19cb0e5f3be7f96b9ce68c15333370c2433d83d
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>
src/glsl/lower_named_interface_blocks.cpp