Fix the incorrect calculation for MAX_NAME_LENGTH

src/libANGLE/Program.cpp

@@ -1910,19 +1910,18 @@ void Program::getActiveShaderStorageBlockName(const GLuint blockIndex,
     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 @@ GLint Program::getActiveUniformBlockMaxLength() const
     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);

src/libANGLE/Program.h

@@ -599,7 +599,8 @@ class Program final : angle::NonCopyable, public LabeledObject
     GLuint getActiveUniformBlockCount() const;
     GLuint getActiveAtomicCounterBufferCount() const;
     GLuint getActiveShaderStorageBlockCount() const;
-    GLint getActiveUniformBlockMaxLength() const;
+    GLint getActiveUniformBlockMaxNameLength() const;
+    GLint getActiveShaderStorageBlockMaxNameLength() const;
 
     GLuint getUniformBlockIndex(const std::string &name) const;
     GLuint getShaderStorageBlockIndex(const std::string &name) const;
@@ -759,6 +760,9 @@ class Program final : angle::NonCopyable, public LabeledObject
                          GLsizei *length,
                          GLchar *name) const;
 
+    template <typename T>
+    GLint getActiveInterfaceBlockMaxNameLength(const std::vector<T> &resources) const;
+
     ProgramState mState;
     rx::ProgramImpl *mProgram;
 

src/libANGLE/queryutils.cpp

@@ -598,9 +598,7 @@ GLint QueryProgramInterfaceMaxNameLength(const Program *program, GLenum programI
             break;
 
         case GL_UNIFORM_BLOCK:
-            maxNameLength =
-                FindMaxSize(program->getState().getUniformBlocks(), &InterfaceBlock::name);
-            break;
+            return program->getActiveUniformBlockMaxNameLength();
 
         case GL_BUFFER_VARIABLE:
             maxNameLength =
@@ -608,13 +606,10 @@ GLint QueryProgramInterfaceMaxNameLength(const Program *program, GLenum programI
             break;
 
         case GL_SHADER_STORAGE_BLOCK:
-            maxNameLength =
-                FindMaxSize(program->getState().getShaderStorageBlocks(), &InterfaceBlock::name);
-            break;
+            return program->getActiveShaderStorageBlockMaxNameLength();
 
         case GL_TRANSFORM_FEEDBACK_VARYING:
-            maxNameLength = clampCast<GLint>(program->getTransformFeedbackVaryingMaxLength() - 1);
-            break;
+            return clampCast<GLint>(program->getTransformFeedbackVaryingMaxLength());
 
         default:
             UNREACHABLE();
@@ -981,7 +976,7 @@ void QueryProgramiv(const Context *context, const Program *program, GLenum pname
             *params = program->getActiveUniformBlockCount();
             return;
         case GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH:
-            *params = program->getActiveUniformBlockMaxLength();
+            *params = program->getActiveUniformBlockMaxNameLength();
             break;
         case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
             *params = program->getTransformFeedbackBufferMode();

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -1113,18 +1113,15 @@
 // OPENGL Failing Tests
 1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL
 1442 NVIDIA OPENGL : dEQP-GLES31.functional.fbo.no_attachments.maximums.all = FAIL
-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.atomic_counter_buffer.buffer_data_size = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.atomic_counter_buffer.referenced_by* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_limited_query.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_variable.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_input.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_output.* = FAIL
-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.shader_storage_block.* = FAIL
+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.shader_storage_block.referenced_by.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.random.* = FAIL
-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.resource_list.block_array = FAIL
-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.resource_list.block_array_single_element = FAIL
 1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.* = FAIL
 1442 OPENGL : dEQP-GLES31.functional.compute.basic.copy_image_to_ssbo_large = FAIL
 1442 OPENGL : dEQP-GLES31.functional.compute.basic.copy_ssbo_to_image_large = FAIL

src/tests/gl_tests/ProgramInterfaceTest.cpp

@@ -286,9 +286,17 @@ TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
         "    vec4 mem0;\n"
         "    vec4 mem1;\n"
         "} instance;\n"
+        "layout(std430) buffer shaderStorageBlock1 {\n"
+        "    vec3 target;\n"
+        "};\n"
+        "layout(std430) buffer shaderStorageBlock2 {\n"
+        "    vec3 target;\n"
+        "} blockInstance2[1];\n"
         "void main()\n"
         "{\n"
         "    oColor = color;\n"
+        "    target = vec3(0, 0, 0);\n"
+        "    blockInstance2[0].target = vec3(1, 1, 1);\n"
         "}";
 
     ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
@@ -338,6 +346,18 @@ TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
 
     glGetProgramInterfaceiv(program, GL_UNIFORM, GL_MAX_NUM_ACTIVE_VARIABLES, &num);
     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
+
+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_ACTIVE_RESOURCES, &num);
+    EXPECT_GL_NO_ERROR();
+    EXPECT_EQ(2, num);
+
+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_MAX_NAME_LENGTH, &num);
+    EXPECT_GL_NO_ERROR();
+    EXPECT_EQ(23, num);  // "shaderStorageBlock2[0]"
+
+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_MAX_NUM_ACTIVE_VARIABLES, &num);
+    EXPECT_GL_NO_ERROR();
+    EXPECT_EQ(1, num);
 }
 
 // Tests the resource property query for uniform can be done correctly.