Mesa (master): glsl: Count builtin uniforms against uniform component limits.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 27 09:48:34 2012 -0700

glsl: Count builtin uniforms against uniform component limits.

We don't fully process the builtin uniforms, but at least
num_uniform_components reflects reality now.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/link_uniforms.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index eef9025..aa8a8b3 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -572,8 +572,11 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
 
 	 /* FINISHME: Update code to process built-in uniforms!
 	  */
-	 if (strncmp("gl_", var->name, 3) == 0)
+	 if (strncmp("gl_", var->name, 3) == 0) {
+	    uniform_size.num_shader_uniform_components +=
+	       var->type->component_slots();
 	    continue;
+	 }
 
 	 uniform_size.process(var);
       }