commit 7159ea6778eb73c233736cc2fa59ae9177b75e4b
author Gregoire Payen de La Garanderie <Gregory.Payen@imgtec.com> Tue Mar 24 14:03:37 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Mon Mar 30 19:49:13 2015 +0000
tree 3822824533d099baec543cfdada04b712f79073a
parent 69c11b5dfccf7883f59e2a5eea86625b1a23d38a

Add UBO offset support for D3D11.1.

Also fixes the uniform count upper limit in glGetActiveUniformsiv.

BUG=angleproject:507

Change-Id: Icfc90ed64cf94b1bab2d4cc93a8fb5e11b28d666
Reviewed-on: https://chromium-review.googlesource.com/261874
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/ProgramGL.cpp

diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index c27e17a..735ff4e 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -367,7 +367,7 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error ProgramGL::applyUniformBuffers(const std::vector<gl::Buffer*> boundBuffers, const gl::Caps &caps)
+gl::Error ProgramGL::applyUniformBuffers(const gl::Data &data)
 {
     UNIMPLEMENTED();
     return gl::Error(GL_INVALID_OPERATION);