commit 337bd698407850d17522a61a2ed3bb881a563e5c
author Shahbaz Youssefi <syoussefi@google.com> Wed Aug 22 16:16:38 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Aug 24 18:09:58 2018 +0000
tree 5b083495770864535e1be74495a2c91f61838585
parent dc248f7168224c676d95a29120de882c852388a7

Disable vertex attributes if not active in program

Even if explicitly enabled.

Bug: angleproject:2138
Change-Id: I598d21296bb6843e05cdeab146c1ff3da3a1174b
Reviewed-on: https://chromium-review.googlesource.com/1185743
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/VertexArray.cpp

diff --git a/src/libANGLE/VertexArray.cpp b/src/libANGLE/VertexArray.cpp
index 88eff70..25f529b 100644
--- a/src/libANGLE/VertexArray.cpp
+++ b/src/libANGLE/VertexArray.cpp
@@ -310,8 +310,12 @@
 
     VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
 
+    if (mState.mEnabledAttributesMask.test(attribIndex) == enabledState)
+    {
+        return;
+    }
+
     attrib.enabled = enabledState;
-    mState.mVertexAttributesTypeMask.setIndex(GetVertexAttributeBaseType(attrib), attribIndex);
 
     setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_ENABLED);