From 5bb94f2bc4c7b7bc707d22f3dba9216d794d4393 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 27 Aug 2012 09:48:34 -0700 Subject: 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 Reviewed-by: Ian Romanick --- src/glsl/link_uniforms.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/glsl') 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); } -- cgit v1.2.3