From: Paul Berry <stereotype441@gmail.com>
Date: Sun, 7 Jul 2013 18:47:22 +0000 (-0700)
Subject: glsl ES: Fix magnitude of gl_MaxVertexUniformVectors.
X-Git-Tag: mesa-9.2.1~293
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f51d68f8c2020ad35b442c4af693ad7a5e5dd0d;p=platform%2Fupstream%2Fmesa.git

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>
---

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",