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/Program.cpp b/src/libANGLE/Program.cpp
index daf0a40..1cafe33 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -1001,9 +1001,9 @@
return mProgram->applyUniforms();
}
-Error Program::applyUniformBuffers(const gl::Data &data)
+Error Program::applyUniformBuffers(const std::vector<gl::Buffer*> boundBuffers, const Caps &caps)
{
- return mProgram->applyUniformBuffers(data, mUniformBlockBindings);
+ return mProgram->applyUniformBuffers(boundBuffers, caps);
}
void Program::flagForDeletion()
@@ -1142,11 +1142,6 @@
return mProgram->getUniformBlockIndex(name);
}
-const UniformBlock *Program::getUniformBlockByIndex(GLuint index) const
-{
- return mProgram->getUniformBlockByIndex(index);
-}
-
void Program::bindUniformBlock(GLuint uniformBlockIndex, GLuint uniformBlockBinding)
{
mUniformBlockBindings[uniformBlockIndex] = uniformBlockBinding;