Remove arraySize in TInterfaceBlock

src/compiler/translator/ParseContext.cpp

@@ -3517,7 +3517,7 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
     }
 
     TInterfaceBlock *interfaceBlock =
-        new TInterfaceBlock(&blockName, fieldList, instanceName, arraySize, blockLayoutQualifier);
+        new TInterfaceBlock(&blockName, fieldList, instanceName, blockLayoutQualifier);
     TType interfaceBlockType(interfaceBlock, typeQualifier.qualifier, blockLayoutQualifier,
                              arraySize);
 

src/compiler/translator/Types.h

@@ -149,11 +149,9 @@ class TInterfaceBlock : public TFieldListCollection
     TInterfaceBlock(const TString *name,
                     TFieldList *fields,
                     const TString *instanceName,
-                    int arraySize,
                     const TLayoutQualifier &layoutQualifier)
         : TFieldListCollection(name, fields),
           mInstanceName(instanceName),
-          mArraySize(arraySize),
           mBlockStorage(layoutQualifier.blockStorage),
           mMatrixPacking(layoutQualifier.matrixPacking),
           mBinding(layoutQualifier.binding)
@@ -162,8 +160,6 @@ class TInterfaceBlock : public TFieldListCollection
 
     const TString &instanceName() const { return *mInstanceName; }
     bool hasInstanceName() const { return mInstanceName != nullptr; }
-    bool isArray() const { return mArraySize > 0; }
-    int arraySize() const { return mArraySize; }
     TLayoutBlockStorage blockStorage() const { return mBlockStorage; }
     TLayoutMatrixPacking matrixPacking() const { return mMatrixPacking; }
     int blockBinding() const { return mBinding; }
@@ -176,7 +172,6 @@ class TInterfaceBlock : public TFieldListCollection
 
   private:
     const TString *mInstanceName;  // for interface block instance names
-    int mArraySize;                // 0 if not an array
     TLayoutBlockStorage mBlockStorage;
     TLayoutMatrixPacking mMatrixPacking;
     int mBinding;
@@ -495,7 +490,10 @@ class TType
     bool array;
     unsigned int arraySize;
 
-    // 0 unless this is an interface block, or interface block member variable
+    // This is set only in the following two cases:
+    // 1) Represents an interface block.
+    // 2) Represents the member variable of an unnamed interface block.
+    // It's nullptr also for members of named interface blocks.
     TInterfaceBlock *interfaceBlock;
 
     // 0 unless this is a struct

src/compiler/translator/UniformHLSL.cpp

@@ -363,11 +363,14 @@ TString UniformHLSL::uniformBlocksHeader(const ReferencedSymbols &referencedInte
         const TType &nodeType                 = interfaceBlockIt->second->getType();
         const TInterfaceBlock &interfaceBlock = *nodeType.getInterfaceBlock();
 
-        unsigned int arraySize      = static_cast<unsigned int>(interfaceBlock.arraySize());
+        // nodeType.isInterfaceBlock() == false means the node is a field of a uniform block which
+        // doesn't have instance name, so this block cannot be an array.
+        unsigned int interfaceBlockArraySize =
+            nodeType.isInterfaceBlock() ? nodeType.getArraySize() : 0;
         unsigned int activeRegister = mUniformBlockRegister;
 
         mUniformBlockRegisterMap[interfaceBlock.name().c_str()] = activeRegister;
-        mUniformBlockRegister += std::max(1u, arraySize);
+        mUniformBlockRegister += std::max(1u, interfaceBlockArraySize);
 
         // FIXME: interface block field names
 
@@ -376,9 +379,9 @@ TString UniformHLSL::uniformBlocksHeader(const ReferencedSymbols &referencedInte
             interfaceBlocks += uniformBlockStructString(interfaceBlock);
         }
 
-        if (arraySize > 0)
+        if (interfaceBlockArraySize > 0)
         {
-            for (unsigned int arrayIndex = 0; arrayIndex < arraySize; arrayIndex++)
+            for (unsigned int arrayIndex = 0; arrayIndex < interfaceBlockArraySize; arrayIndex++)
             {
                 interfaceBlocks +=
                     uniformBlockString(interfaceBlock, activeRegister + arrayIndex, arrayIndex);
@@ -429,7 +432,7 @@ TString UniformHLSL::uniformBlockInstanceString(const TInterfaceBlock &interface
     {
         return "";
     }
-    else if (interfaceBlock.isArray())
+    else if (arrayIndex != GL_INVALID_INDEX)
     {
         return DecoratePrivate(interfaceBlock.instanceName()) + "_" + str(arrayIndex);
     }