Make default block member info a constant.

src/compiler/translator/blocklayout.h

@@ -27,27 +27,20 @@ struct InterfaceBlock;
 
 struct BlockMemberInfo
 {
-    BlockMemberInfo()
-        : offset(-1),
-          arrayStride(-1),
-          matrixStride(-1),
-          isRowMajorMatrix(false),
-          topLevelArrayStride(-1)
-    {}
+    constexpr BlockMemberInfo() = default;
 
-    BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
+    constexpr BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
         : offset(offset),
           arrayStride(arrayStride),
           matrixStride(matrixStride),
-          isRowMajorMatrix(isRowMajorMatrix),
-          topLevelArrayStride(-1)
+          isRowMajorMatrix(isRowMajorMatrix)
     {}
 
-    BlockMemberInfo(int offset,
-                    int arrayStride,
-                    int matrixStride,
-                    bool isRowMajorMatrix,
-                    int topLevelArrayStride)
+    constexpr BlockMemberInfo(int offset,
+                              int arrayStride,
+                              int matrixStride,
+                              bool isRowMajorMatrix,
+                              int topLevelArrayStride)
         : offset(offset),
           arrayStride(arrayStride),
           matrixStride(matrixStride),
@@ -55,15 +48,26 @@ struct BlockMemberInfo
           topLevelArrayStride(topLevelArrayStride)
     {}
 
-    static BlockMemberInfo getDefaultBlockInfo() { return BlockMemberInfo(-1, -1, -1, false, -1); }
+    // A single integer identifying the offset of an active variable.
+    int offset = -1;
+
+    // A single integer identifying the stride between array elements in an active variable.
+    int arrayStride = -1;
 
-    int offset;
-    int arrayStride;
-    int matrixStride;
-    bool isRowMajorMatrix;
-    int topLevelArrayStride;  // Only used for shader storage block members.
+    // A single integer identifying the stride between columns of a column-major matrix or rows of a
+    // row-major matrix.
+    int matrixStride = -1;
+
+    // A single integer identifying whether an active variable is a row-major matrix.
+    bool isRowMajorMatrix = false;
+
+    // A single integer identifying the number of active array elements of the top-level shader
+    // storage block member containing the active variable.
+    int topLevelArrayStride = -1;
 };
 
+constexpr BlockMemberInfo kDefaultBlockMemberInfo;
+
 class BlockLayoutEncoder
 {
   public:

src/libANGLE/ProgramLinkedResources.cpp

@@ -523,7 +523,7 @@ class FlattenUniformVisitor : public sh::VariableNameVisitor
         {
             LinkedUniform linkedUniform(variable.type, variable.precision, fullNameWithArrayIndex,
                                         variable.arraySizes, getBinding(), getOffset(), mLocation,
-                                        -1, sh::BlockMemberInfo::getDefaultBlockInfo());
+                                        -1, sh::kDefaultBlockMemberInfo);
             linkedUniform.mappedName = fullMappedNameWithArrayIndex;
             linkedUniform.active     = mMarkActive;
             linkedUniform.staticUse  = mMarkStaticUse;

src/libANGLE/Uniform.cpp

@@ -48,7 +48,7 @@ GLuint ActiveVariable::activeShaderCount() const
 }
 
 LinkedUniform::LinkedUniform()
-    : typeInfo(nullptr), bufferIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
+    : typeInfo(nullptr), bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo)
 {}
 
 LinkedUniform::LinkedUniform(GLenum typeIn,
@@ -77,7 +77,7 @@ LinkedUniform::LinkedUniform(const sh::Uniform &uniform)
     : sh::Uniform(uniform),
       typeInfo(&GetUniformTypeInfo(type)),
       bufferIndex(-1),
-      blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
+      blockInfo(sh::kDefaultBlockMemberInfo)
 {
     ASSERT(!isArrayOfArrays());
     ASSERT(!isArray() || !isStruct());
@@ -139,7 +139,7 @@ size_t LinkedUniform::getElementComponents() const
 }
 
 BufferVariable::BufferVariable()
-    : bufferIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo()), topLevelArraySize(-1)
+    : bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo), topLevelArraySize(-1)
 {}
 
 BufferVariable::BufferVariable(GLenum typeIn,

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -238,7 +238,7 @@ bool InterfaceBlockInfo::getBlockMemberInfo(const std::string &name,
     auto infoIter = mBlockLayout.find(name);
     if (infoIter == mBlockLayout.end())
     {
-        *infoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *infoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }
 

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -715,7 +715,7 @@ bool ProgramGL::getUniformBlockMemberInfo(const std::string & /* memberUniformNa
 
     if (uniformIndex == GL_INVALID_INDEX)
     {
-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }
 
@@ -744,7 +744,7 @@ bool ProgramGL::getShaderStorageBlockMemberInfo(const std::string & /* memberNam
 
     if (index == GL_INVALID_INDEX)
     {
-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }