VertexArray: Add enabled attribs bitmask.

src/libANGLE/State.cpp

@@ -2205,8 +2205,7 @@ bool State::hasMappedBuffer(BufferBinding target) const
         const VertexArray *vao     = getVertexArray();
         const auto &vertexAttribs = vao->getVertexAttributes();
         const auto &vertexBindings = vao->getVertexBindings();
-        size_t maxEnabledAttrib = vao->getMaxEnabledAttribute();
-        for (size_t attribIndex = 0; attribIndex < maxEnabledAttrib; attribIndex++)
+        for (size_t attribIndex : vao->getEnabledAttributesMask())
         {
             const VertexAttribute &vertexAttrib = vertexAttribs[attribIndex];
             auto *boundBuffer = vertexBindings[vertexAttrib.bindingIndex].getBuffer().get();

src/libANGLE/VertexArray.cpp

@@ -16,7 +16,7 @@ namespace gl
 {
 
 VertexArrayState::VertexArrayState(size_t maxAttribs, size_t maxAttribBindings)
-    : mLabel(), mVertexBindings(maxAttribBindings), mMaxEnabledAttribute(0)
+    : mLabel(), mVertexBindings(maxAttribBindings)
 {
     ASSERT(maxAttribs <= maxAttribBindings);
 
@@ -206,18 +206,7 @@ void VertexArray::enableAttribute(size_t attribIndex, bool enabledState)
     mDirtyBits.set(DIRTY_BIT_ATTRIB_0_ENABLED + attribIndex);
 
     // Update state cache
-    if (enabledState)
-    {
-        mState.mMaxEnabledAttribute = std::max(attribIndex + 1, mState.mMaxEnabledAttribute);
-    }
-    else if (mState.mMaxEnabledAttribute == attribIndex + 1)
-    {
-        while (mState.mMaxEnabledAttribute > 0 &&
-               !mState.mVertexAttributes[mState.mMaxEnabledAttribute - 1].enabled)
-        {
-            --mState.mMaxEnabledAttribute;
-        }
-    }
+    mState.mEnabledAttributesMask.set(attribIndex, enabledState);
 }
 
 void VertexArray::setVertexAttribPointer(const Context *context,

src/libANGLE/VertexArray.h

@@ -42,7 +42,7 @@ class VertexArrayState final : angle::NonCopyable
     const BindingPointer<Buffer> &getElementArrayBuffer() const { return mElementArrayBuffer; }
     size_t getMaxAttribs() const { return mVertexAttributes.size(); }
     size_t getMaxBindings() const { return mVertexBindings.size(); }
-    size_t getMaxEnabledAttribute() const { return mMaxEnabledAttribute; }
+    const AttributesMask &getEnabledAttributesMask() const { return mEnabledAttributesMask; }
     const std::vector<VertexAttribute> &getVertexAttributes() const { return mVertexAttributes; }
     const VertexAttribute &getVertexAttribute(size_t attribIndex) const
     {
@@ -68,7 +68,7 @@ class VertexArrayState final : angle::NonCopyable
     std::vector<VertexAttribute> mVertexAttributes;
     BindingPointer<Buffer> mElementArrayBuffer;
     std::vector<VertexBinding> mVertexBindings;
-    size_t mMaxEnabledAttribute;
+    AttributesMask mEnabledAttributesMask;
 };
 
 class VertexArray final : public LabeledObject
@@ -147,7 +147,10 @@ class VertexArray final : public LabeledObject
 
     rx::VertexArrayImpl *getImplementation() const { return mVertexArray; }
 
-    size_t getMaxEnabledAttribute() const { return mState.getMaxEnabledAttribute(); }
+    const AttributesMask &getEnabledAttributesMask() const
+    {
+        return mState.getEnabledAttributesMask();
+    }
 
     enum DirtyBitType
     {

src/libANGLE/validationES.cpp

@@ -47,8 +47,7 @@ bool ValidateDrawAttribs(ValidationContext *context,
     const VertexArray *vao     = state.getVertexArray();
     const auto &vertexAttribs  = vao->getVertexAttributes();
     const auto &vertexBindings = vao->getVertexBindings();
-    size_t maxEnabledAttrib    = vao->getMaxEnabledAttribute();
-    for (size_t attributeIndex = 0; attributeIndex < maxEnabledAttrib; ++attributeIndex)
+    for (size_t attributeIndex : vao->getEnabledAttributesMask())
     {
         const VertexAttribute &attrib = vertexAttribs[attributeIndex];