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.h

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.h b/src/libANGLE/renderer/d3d/ProgramD3D.h
index afcf0a8..e938600 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.h
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.h
@@ -78,7 +78,7 @@
 
     void initializeUniformStorage();
     gl::Error applyUniforms();
-    gl::Error applyUniformBuffers(const gl::Data &data, GLuint uniformBlockBindings[]) override;
+    gl::Error applyUniformBuffers(const gl::Data &data);
     void assignUniformBlockRegister(gl::UniformBlock *uniformBlock,
                                     GLenum shader,
                                     unsigned int registerIndex,