aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/link_uniforms.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-14 11:09:08 +0200
committermarha <marha@users.sourceforge.net>2012-09-14 11:09:08 +0200
commitb08ba56019b146786e1cde553c036dd0c4fd02e5 (patch)
tree651ada0a32bd95a5c80838f11d31205c8d3e8807 /mesalib/src/glsl/link_uniforms.cpp
parentaa10a08696cae93799fcddae3f0245ceee905e01 (diff)
downloadvcxsrv-b08ba56019b146786e1cde553c036dd0c4fd02e5.tar.gz
vcxsrv-b08ba56019b146786e1cde553c036dd0c4fd02e5.tar.bz2
vcxsrv-b08ba56019b146786e1cde553c036dd0c4fd02e5.zip
fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012
Diffstat (limited to 'mesalib/src/glsl/link_uniforms.cpp')
-rw-r--r--mesalib/src/glsl/link_uniforms.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp
index eef9025cf..aa8a8b3fb 100644
--- a/mesalib/src/glsl/link_uniforms.cpp
+++ b/mesalib/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);
}