commit 7a20b97396073d34af4f94140fc0ef2cb94b92e9
author jchen10 <jie.a.chen@intel.com> Tue Jun 13 14:25:26 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Thu Jun 22 14:24:00 2017 +0000
tree 27bf2ab87b30a400f5cb3c7f4f18e19b958e07e2
parent db9e5d31129abb16c5268897f157ed7d6ebb3b74

Refactor uniform block binding

Remove mUniformBlockBindings and move its bindings to mUniformBlocks.

BUG=angleproject:1442

Change-Id: I62b4471990a44e626d2357c41cb914abc27cb18f
Reviewed-on: https://chromium-review.googlesource.com/532834
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/MemoryProgramCache.cpp

diff --git a/src/libANGLE/MemoryProgramCache.cpp b/src/libANGLE/MemoryProgramCache.cpp
index 7a99925..7853a00 100644
--- a/src/libANGLE/MemoryProgramCache.cpp
+++ b/src/libANGLE/MemoryProgramCache.cpp
@@ -146,14 +146,8 @@
         }
 
         state->mUniformBlocks.push_back(uniformBlock);
-    }
 
-    for (GLuint bindingIndex = 0; bindingIndex < state->mUniformBlockBindings.size();
-         ++bindingIndex)
-    {
-        stream.readInt(&state->mUniformBlockBindings[bindingIndex]);
-        state->mActiveUniformBlockBindings.set(bindingIndex,
-                                               state->mUniformBlockBindings[bindingIndex] != 0);
+        state->mActiveUniformBlockBindings.set(uniformBlockIndex, uniformBlock.binding != 0);
     }
 
     unsigned int transformFeedbackVaryingCount = stream.readInt<unsigned int>();
@@ -301,11 +295,6 @@
         }
     }
 
-    for (GLuint binding : state.getUniformBlockBindings())
-    {
-        stream.writeInt(binding);
-    }
-
     stream.writeInt(state.getLinkedTransformFeedbackVaryings().size());
     for (const auto &var : state.getLinkedTransformFeedbackVaryings())
     {