Mesa (master): glsl ES: Fix magnitude of gl_MaxVertexUniformVectors.

Paul Berry stereotype441 at kemper.freedesktop.org
Sat Jul 13 01:19:18 UTC 2013


Module: Mesa
Branch: master
Commit: 8f51d68f8c2020ad35b442c4af693ad7a5e5dd0d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f51d68f8c2020ad35b442c4af693ad7a5e5dd0d

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Sun Jul  7 11:47:22 2013 -0700

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 at lists.freedesktop.org

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 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 f4ac205..58019c6 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -533,7 +533,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",




More information about the mesa-commit mailing list