diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-07-07 11:47:22 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-07-15 13:37:19 -0700 |
| commit | e292c4656af6a8b3cd6bfc584cf09b2d0cee9917 (patch) | |
| tree | ed85a9bd4f85ef42b4f561fa9c1ed3c41b4b4f22 | |
| parent | 8bb40f7b2bf03bef0b98c00663e0871699c6dcf9 (diff) | |
glsl ES: Fix magnitude of gl_MaxVertexUniformVectors.
Previously, we set it equal to MaxVertexUniformComponents. It should
be MaxVertexUniformComponents / 4.
NOTE: This is a candidate for the stable branches.
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit 8f51d68f8c2020ad35b442c4af693ad7a5e5dd0d)
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 6a17adea232..e453de475be 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -527,7 +527,7 @@ generate_common_ES_uniforms(exec_list *instructions, add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs", state->Const.MaxVertexAttribs); add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformVectors", - state->Const.MaxVertexUniformComponents); + state->Const.MaxVertexUniformComponents / 4); add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits", state->Const.MaxVertexTextureImageUnits); add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits", |