Add support for arrays of aggregates (aka structs) in uniform blocks.

src/compiler/Uniform.cpp

@@ -92,7 +92,17 @@ bool InterfaceBlock::getBlockLayoutInfo(const sh::Uniform &uniform, unsigned int
 {
     if (!uniform.fields.empty())
     {
-        getBlockLayoutInfo(uniform.fields, currentOffset);
+        if (uniform.arraySize > 0)
+        {
+            for (unsigned int arrayElement = 0; arrayElement < uniform.arraySize; arrayElement++)
+            {
+                getBlockLayoutInfo(uniform.fields, currentOffset);
+            }
+        }
+        else
+        {
+            getBlockLayoutInfo(uniform.fields, currentOffset);
+        }
         return false;
     }
 

src/libGLESv2/ProgramBinary.cpp

@@ -2370,7 +2370,18 @@ void ProgramBinary::defineUniformBlockMembers(const sh::ActiveUniforms &uniforms
 
         if (!uniform.fields.empty())
         {
-            defineUniformBlockMembers(uniform.fields, uniform.name, blockIndex, blockInfoItr, blockUniformIndexes);
+            if (uniform.arraySize > 0)
+            {
+                for (unsigned int arrayElement = 0; arrayElement < uniform.arraySize; arrayElement++)
+                {
+                    const std::string uniformElementName = uniform.name + "[" + str(arrayElement) + "]";
+                    defineUniformBlockMembers(uniform.fields, uniformElementName, blockIndex, blockInfoItr, blockUniformIndexes);
+                }
+            }
+            else
+            {
+                defineUniformBlockMembers(uniform.fields, uniform.name, blockIndex, blockInfoItr, blockUniformIndexes);
+            }
         }
         else
         {