Report correct name length for array variables in GetActiveUniformiv.

TRAC #23018 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2370 736b8ea6-26fd-11df-bfd4-992fa37f6226

Report correct name length for array variables in GetActiveUniformiv.
b1dc1b6a · shannonwoods@chromium.org · 932cc6b0 · b1dc1b6a
Commit b1dc1b6a authored May 30, 2013 by shannonwoods@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ProgramBinary.cpp src/libGLESv2/ProgramBinary.cpp +1 -1

No files found.
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -2723,7 +2723,7 @@ GLint ProgramBinary::getActiveUniformi(GLuint index, GLenum pname) const
    {
      case GL_UNIFORM_TYPE:         return static_cast<GLint>(uniform.type);
      case GL_UNIFORM_SIZE:         return static_cast<GLint>(uniform.elementCount());
-      case GL_UNIFORM_NAME_LENGTH:  return static_cast<GLint>(uniform.name.size() + 1);
+      case GL_UNIFORM_NAME_LENGTH:  return static_cast<GLint>(uniform.name.size() + 1 + (uniform.isArray() ? 3 : 0));
      case GL_UNIFORM_BLOCK_INDEX:  return uniform.blockIndex;

      case GL_UNIFORM_OFFSET:       return uniform.blockInfo.offset;