Set the right size on the uniform bindings array.

BUG=angleproject:1468 Change-Id: I3d75a03fcf624fe7f9510e76edc4a8298d8c5a72 Reviewed-on: https://chromium-review.googlesource.com/412860 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

Set the right size on the uniform bindings array.
4dc3af09 · Geoff Lang · Commit Bot · 437cca5a · 4dc3af09 · 4dc3af09
Commit 4dc3af09 authored Nov 18, 2016 by Geoff Lang Committed by Commit Bot Nov 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Context.cpp src/libANGLE/Context.cpp +1 -1

State.cpp src/libANGLE/State.cpp +1 -1

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -323,7 +323,7 @@ Context::Context(rx::EGLImplFactory *implFactory,
    bindRenderbuffer(GL_RENDERBUFFER, 0);

    bindGenericUniformBuffer(0);
-    for (unsigned int i = 0; i < mCaps.maxCombinedUniformBlocks; i++)
+    for (unsigned int i = 0; i < mCaps.maxUniformBufferBindings; i++)
    {
        bindIndexedUniformBuffer(0, i, 0, -1);
    }

--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -160,7 +160,7 @@ void State::initialize(const Caps &caps,

    mVertexAttribCurrentValues.resize(caps.maxVertexAttributes);

-    mUniformBuffers.resize(caps.maxCombinedUniformBlocks);
+    mUniformBuffers.resize(caps.maxUniformBufferBindings);

    mSamplerTextures[GL_TEXTURE_2D].resize(caps.maxCombinedTextureImageUnits);
    mSamplerTextures[GL_TEXTURE_CUBE_MAP].resize(caps.maxCombinedTextureImageUnits);