commit d1fe1646bd2e55e7a044a8dae20ee78bf4ab1914
author Jamie Madill <jmadill@chromium.org> Fri Aug 21 16:26:04 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Aug 21 20:27:03 2015 +0000
tree 2fe544598d3e3f93adf36f057bea40e52217fc6a
parent 72f39c159883257ffebacc7c15e6e9102be3ddfe

Move UBO bindings into Program shared state.

Sharing the bindings with the Impl (read-only) allows us to clean out
the applyUniformBuffers method from the Impl class, and make it D3D-
only.

BUG=angleproject:1123

Change-Id: Icb51a90cb227bbbdd83319ea308b68aa1c4c325e
Reviewed-on: https://chromium-review.googlesource.com/293824
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index ba5e0f6..8ff6ea5 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1216,7 +1216,7 @@
     return gl::Error(GL_NO_ERROR);
 }
 
-gl::Error ProgramD3D::applyUniformBuffers(const gl::Data &data, GLuint uniformBlockBindings[])
+gl::Error ProgramD3D::applyUniformBuffers(const gl::Data &data)
 {
     mVertexUBOCache.clear();
     mFragmentUBOCache.clear();
@@ -1227,7 +1227,7 @@
     for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < mUniformBlocks.size(); uniformBlockIndex++)
     {
         gl::UniformBlock *uniformBlock = mUniformBlocks[uniformBlockIndex];
-        GLuint blockBinding = uniformBlockBindings[uniformBlockIndex];
+        GLuint blockBinding            = mData.getUniformBlockBinding(uniformBlockIndex);
 
         ASSERT(uniformBlock);