commit 9bf555277c932bd77240ec91a04cc4d41d3b86ed
author Qin Jiajia <jiajia.qin@intel.com> Mon Jan 29 13:56:23 2018 +0800
committer Commit Bot <commit-bot@chromium.org> Wed Jan 31 17:39:03 2018 +0000
tree b2f185b3b79a2689ce8858812e22679ba1b8c699
parent 79de62c665bda1a2a32e21ce263127d569cbc50f

Fix the incorrect calculation for MAX_NAME_LENGTH

The old implementation forgot to consider the instance array situation.
This change will use unified method to calculate the interface block's
MAX_NAME_LENGTH. It also removes some cases which have already passed
from expectation files.

BUG=angleproject:1920
TEST=angle_end2end_tests
     *program_interface_query.uniform_block.resource_list.block_array*
     *program_interface_query.shader_storage_block.resource_list.block_array*

Change-Id: I6ef53951487e6366d69ecaa43e4df6824baad042
Reviewed-on: https://chromium-review.googlesource.com/890386
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index c756a92..fffaaab 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -1910,19 +1910,18 @@
     GetInterfaceBlockName(blockIndex, mState.mShaderStorageBlocks, bufSize, length, blockName);
 }
 
-GLint Program::getActiveUniformBlockMaxLength() const
+template <typename T>
+GLint Program::getActiveInterfaceBlockMaxNameLength(const std::vector<T> &resources) const
 {
     int maxLength = 0;
 
     if (mLinked)
     {
-        unsigned int numUniformBlocks = static_cast<unsigned int>(mState.mUniformBlocks.size());
-        for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < numUniformBlocks; uniformBlockIndex++)
+        for (const T &resource : resources)
         {
-            const InterfaceBlock &uniformBlock = mState.mUniformBlocks[uniformBlockIndex];
-            if (!uniformBlock.name.empty())
+            if (!resource.name.empty())
             {
-                int length = static_cast<int>(uniformBlock.nameWithArrayIndex().length());
+                int length = static_cast<int>(resource.nameWithArrayIndex().length());
                 maxLength  = std::max(length + 1, maxLength);
             }
         }
@@ -1931,6 +1930,16 @@
     return maxLength;
 }
 
+GLint Program::getActiveUniformBlockMaxNameLength() const
+{
+    return getActiveInterfaceBlockMaxNameLength(mState.mUniformBlocks);
+}
+
+GLint Program::getActiveShaderStorageBlockMaxNameLength() const
+{
+    return getActiveInterfaceBlockMaxNameLength(mState.mShaderStorageBlocks);
+}
+
 GLuint Program::getUniformBlockIndex(const std::string &name) const
 {
     return GetInterfaceBlockIndex(mState.mUniformBlocks, name);