Only apply uniform buffers referenced by the Program.

Continues to pass dEQP-GLES3.functional.ubo.* Performance regression in draw call overhead is fixed. BUG=angleproject:882 BUG=angleproject:1171 Change-Id: I1d827d70611c1bf743a7930796e31a54aca04b1e Reviewed-on: https://chromium-review.googlesource.com/303473 Tryjob-Request: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Only apply uniform buffers referenced by the Program.
33bb5ad6 · Geoff Lang · 7e921616 · 33bb5ad6
Commit 33bb5ad6 authored Oct 05, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

StateManagerGL.cpp src/libANGLE/renderer/gl/StateManagerGL.cpp +1 -2

No files found.
--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/src/libANGLE/renderer/gl/StateManagerGL.cpp
@@ -546,8 +546,7 @@ gl::Error StateManagerGL::setGenericDrawState(const gl::Data &data)
    const ProgramGL *programGL = GetImplAs<ProgramGL>(program);
    useProgram(programGL->getProgramID());
-    for (size_t uniformBlockIndex = 0;
+    for (size_t uniformBlockIndex = 0; uniformBlockIndex < program->getActiveUniformBlockCount();
-         uniformBlockIndex < gl::IMPLEMENTATION_MAX_COMBINED_SHADER_UNIFORM_BUFFERS;
         uniformBlockIndex++)
    {
        GLuint binding = program->getUniformBlockBinding(static_cast<GLuint>(uniformBlockIndex));