Mesa (master): mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH.

Eric Anholt anholt at kemper.freedesktop.org
Mon Aug 23 17:34:56 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 23 09:47:15 2010 -0700

mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH.

Fixes: glsl-getactiveuniform-length.

---

 src/mesa/main/shaderapi.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index cc350c9..1335f0f 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;




More information about the mesa-commit mailing list