From: Eric Anholt <eric@anholt.net>
Date: Mon, 27 Aug 2012 16:48:34 +0000 (-0700)
Subject: glsl: Count builtin uniforms against uniform component limits.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5bb94f2bc4c7b7bc707d22f3dba9216d794d4393;p=mesa.git

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@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index eef9025cf28..aa8a8b3fbd8 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);
       }