commit 5f8d9b46e94f105d8059db997cc0f7078b36b395
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:17:57 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:17:57 2013 +0000
tree a16ec885c7090236cc287aad533a6fde17baec83
parent 70961b334672790767581c2c2fa75452bb2f4475

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

TRAC #23018

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2388 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/Uniform.cpp

diff --git a/src/compiler/Uniform.cpp b/src/compiler/Uniform.cpp
index 917e08f..9a643ba 100644
--- a/src/compiler/Uniform.cpp
+++ b/src/compiler/Uniform.cpp
@@ -92,7 +92,17 @@
 {
     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;
     }