Mesa (master): glsl: Don't resize arrays in uniform blocks.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 9feb403b0eb5365889cb01ca456a19247aaad502
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9feb403b0eb5365889cb01ca456a19247aaad502

Author: Eric Anholt <eric at anholt.net>
Date:   Tue May  1 14:43:31 2012 -0700

glsl: Don't resize arrays in uniform blocks.

This is a requirement for std140 uniform blocks, and optional for
packed/shared blocks.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/linker.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 7fbd834..dd22785 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1165,6 +1165,13 @@ update_array_sizes(struct gl_shader_program *prog)
 	     !var->type->is_array())
 	    continue;
 
+	 /* GL_ARB_uniform_buffer_object says that std140 uniforms
+	  * will not be eliminated.  Since we always do std140, just
+	  * don't resize arrays in UBOs.
+	  */
+	 if (var->uniform_block != -1)
+	    continue;
+
 	 unsigned int size = var->max_array_access;
 	 for (unsigned j = 0; j < MESA_SHADER_TYPES; j++) {
 	       if (prog->_LinkedShaders[j] == NULL)