commit fc43d273cbbbed105fa05c71741b479403d2290c
author Jamie Madill <jmadill@chromium.org> Fri Jul 11 17:02:02 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Jul 16 18:43:10 2014 +0000
tree ade97f7b7b748fc55ff613210c1f186afbad23ca
parent d4116ff357cdc7cae5cd343df26a0cd4da5228a2

Remove the sh::InterfaceBlock::dataSize member.

We can replace this by doing the same calculation in the HLSL-side
code.

BUG=angle:466

Change-Id: Iecae4a92e9037e851419ce73e6267094ee8071a2
Reviewed-on: https://chromium-review.googlesource.com/207251
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index f56ece5..2c1bcac 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -2305,19 +2305,21 @@
         BlockInfoItr blockInfoItr = interfaceBlock.blockInfo.cbegin();
         defineUniformBlockMembers(interfaceBlock.fields, "", blockIndex, &blockInfoItr, &blockUniformIndexes);
 
+        size_t dataSize = sh::HLSLInterfaceBlockDataSize(interfaceBlock);
+
         // create all the uniform blocks
         if (interfaceBlock.arraySize > 0)
         {
             for (unsigned int uniformBlockElement = 0; uniformBlockElement < interfaceBlock.arraySize; uniformBlockElement++)
             {
-                UniformBlock *newUniformBlock = new UniformBlock(interfaceBlock.name, uniformBlockElement, interfaceBlock.dataSize);
+                UniformBlock *newUniformBlock = new UniformBlock(interfaceBlock.name, uniformBlockElement, dataSize);
                 newUniformBlock->memberUniformIndexes = blockUniformIndexes;
                 mUniformBlocks.push_back(newUniformBlock);
             }
         }
         else
         {
-            UniformBlock *newUniformBlock = new UniformBlock(interfaceBlock.name, GL_INVALID_INDEX, interfaceBlock.dataSize);
+            UniformBlock *newUniformBlock = new UniformBlock(interfaceBlock.name, GL_INVALID_INDEX, dataSize);
             newUniformBlock->memberUniformIndexes = blockUniformIndexes;
             mUniformBlocks.push_back(newUniformBlock);
         }