From: Eric Anholt <eric@anholt.net>
Date: Mon, 23 Aug 2010 16:47:15 +0000 (-0700)
Subject: mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=001a7bfdfc8b3c8930d5ced21982dbdfb8cd35b3;p=mesa.git

mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH.

Fixes: glsl-getactiveuniform-length.
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index cc350c93b97..1335f0f4111 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -644,8 +644,6 @@ get_programiv(GLcontext *ctx, GLuint program, GLenum pname, GLint *params)
       break;
    case GL_ACTIVE_UNIFORM_MAX_LENGTH:
       *params = _mesa_longest_uniform_name(shProg->Uniforms);
-      if (*params > 0)
-         (*params)++;  /* add one for terminating zero */
       break;
    case GL_PROGRAM_BINARY_LENGTH_OES:
       *params = 0;