Report correct name length for active uniform block arrays.

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

Report correct name length for active uniform block arrays.
932cc6b0 · shannonwoods@chromium.org · 83ac5e82 · 932cc6b0
Commit 932cc6b0 authored May 30, 2013 by shannonwoods@chromium.org
Show 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
@@ -2775,7 +2775,7 @@ void ProgramBinary::getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pna
        *params = static_cast<GLint>(uniformBlock.dataSize);
        break;
      case GL_UNIFORM_BLOCK_NAME_LENGTH:
-        *params = static_cast<GLint>(uniformBlock.name.size() + 1);
+        *params = static_cast<GLint>(uniformBlock.name.size() + 1 + (uniformBlock.isArrayElement() ? 3 : 0));
        break;
      case GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS:
        *params = static_cast<GLint>(uniformBlock.memberUniformIndexes.size());