ES3: Fix off-by-one max enabled attrib.

In some cases we would have a 'max enabled' attrib that was checked incorrectly, and this could lead to edge cases which crash when we have a vertex attribute and buffer both NULL. BUG=angleproject:1081 TEST=dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array Change-Id: I62a9fa79f38340c99a708e54751d2b67dd4b6c1f Reviewed-on: https://chromium-review.googlesource.com/286854Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

ES3: Fix off-by-one max enabled attrib.
cc7bbafa · Jamie Madill · 375c37c9 · cc7bbafa
Commit cc7bbafa authored Jul 21, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

VertexArray.cpp src/libANGLE/VertexArray.cpp +4 -3

No files found.
--- a/src/libANGLE/VertexArray.cpp
+++ b/src/libANGLE/VertexArray.cpp
@@ -87,11 +87,12 @@ void VertexArray::enableAttribute(size_t attributeIndex, bool enabledState)
    // Update state cache
    if (enabledState)
    {
-        mData.mMaxEnabledAttribute = std::max(attributeIndex, mData.mMaxEnabledAttribute);
+        mData.mMaxEnabledAttribute = std::max(attributeIndex + 1, mData.mMaxEnabledAttribute);
    }
-    else if (mData.mMaxEnabledAttribute == attributeIndex)
+    else if (mData.mMaxEnabledAttribute == attributeIndex + 1)
    {
-        while (mData.mMaxEnabledAttribute > 0 && !mData.mVertexAttributes[mData.mMaxEnabledAttribute].enabled)
+        while (mData.mMaxEnabledAttribute > 0 &&
+               !mData.mVertexAttributes[mData.mMaxEnabledAttribute - 1].enabled)
        {
            --mData.mMaxEnabledAttribute;
        }