commit 3917f578c7f50314dc36d4f8ec54b6024610b4ce
author Gregoire Payen de La Garanderie <Gregory.Payen@imgtec.com> Wed Apr 01 15:17:21 2015 +0100
committer Jamie Madill <jmadill@chromium.org> Wed Apr 01 14:20:22 2015 +0000
tree 1ca83d3bca9f8e6559f4192735fbd0be1feee024
parent a79fac985fe0f73a443635f44e1a0bd12c35602c

Revert "Add UBO offset support for D3D11.1."

Was ignoring the uniform block bindings.

This reverts commit 7159ea6778eb73c233736cc2fa59ae9177b75e4b.

Change-Id: Ie7d2b40d3fb2adedd309f1162fb6fd33ab0b4c3c
Reviewed-on: https://chromium-review.googlesource.com/263420
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/ProgramImpl.h

diff --git a/src/libANGLE/renderer/ProgramImpl.h b/src/libANGLE/renderer/ProgramImpl.h
index 27257a8..a17bb6d 100644
--- a/src/libANGLE/renderer/ProgramImpl.h
+++ b/src/libANGLE/renderer/ProgramImpl.h
@@ -94,7 +94,7 @@
                                     const gl::Caps &caps) = 0;
 
     virtual gl::Error applyUniforms() = 0;
-    virtual gl::Error applyUniformBuffers(const gl::Data &data) = 0;
+    virtual gl::Error applyUniformBuffers(const std::vector<gl::Buffer*> boundBuffers, const gl::Caps &caps) = 0;
     virtual bool assignUniformBlockRegister(gl::InfoLog &infoLog, gl::UniformBlock *uniformBlock, GLenum shader,
                                             unsigned int registerIndex, const gl::Caps &caps) = 0;