diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-14 11:11:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-14 11:11:28 +0200 |
| commit | c0212d660fe99ea5e4a1b897670f7f7c111553c7 (patch) | |
| tree | 12c04842a73bb885640f1e23ef9a3ca654d09c5a /mesalib/src/glsl/link_uniforms.cpp | |
| parent | f61137c5cf42ded5eeb85eaf007ae11f0811e022 (diff) | |
| parent | b08ba56019b146786e1cde553c036dd0c4fd02e5 (diff) | |
| download | vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.tar.gz vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.tar.bz2 vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/link_uniforms.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index 5d701e75e..118bfae68 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); } |