| commit | 90a09b56ce44e0f67cb7ab7f8d9bbc179f325597 | [log] [tgz] |
|---|---|---|
| author | Geoff Lang <geofflang@chromium.org> | Wed Apr 01 18:21:24 2015 +0000 |
| committer | Geoff Lang <geofflang@chromium.org> | Wed Apr 01 18:21:45 2015 +0000 |
| tree | f102332c59efb5a392ab8d621ed88f7554af3bcd | |
| parent | 381f969315c0c70bacf183e58de7194f42486112 [diff] [blame] |
Revert "Add UBO offset support for D3D11.1." Failed on 32-bit builds. See: https://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Win%20Builder/builds/24828/steps/compile/logs/stdio angle\src\libangle\validationes.cpp(1461) : error C2220: warning treated as error - no 'object' file generated angle\src\libangle\validationes.cpp(1461) : warning C4018: '<' : signed/unsigned mismatch This reverts commit 381f969315c0c70bacf183e58de7194f42486112. Change-Id: I05f09f19e40046994d34809c5b79095458f56148 Reviewed-on: https://chromium-review.googlesource.com/263474 Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/renderer/ProgramImpl.h b/src/libANGLE/renderer/ProgramImpl.h index 1128ab6..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, GLuint uniformBlockBindings[]) = 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;