BufferBindingMask in VertexArray::onBufferChanged are same buffer

The bufferBiningMask bits received from VertexArray::onBufferChanged()
must point to the same buffer, in case of one buffer is bound to
multiple binding points. We can do some minor optimization here when we
loop the BufferBindingMask bits: We only need to calculate hasConflict
once when we call updateCachedTransformFeedbackBindingValidation().

Bug: b/433331119
Change-Id: I9f7cfa543deb46cd369915293b97f5d3122e1708
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6826782
Commit-Queue: Charlie Lao <cclao@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>

Author: cclao

src/libANGLE/Buffer.cpp

@@ -549,7 +549,7 @@ void Buffer::onStateChange(const Context *context, angle::SubjectMessage message
 
     // Apply the change directly on current context's current vertex array. All other vertex arrays
     // requires a buffer rebind in order to pick up the change.
-    context->onBufferChanged(message,
+    context->onBufferChanged(this, message,
                              mVertexArrayBufferBindingMaskAndContext.getBufferBindingMask(context));
 }
 
@@ -561,7 +561,7 @@ void Buffer::onContentsChange(const Context *context)
         static_cast<Texture *>(contentsObserver.observer)->onBufferContentsChange();
     }
 
-    context->onBufferChanged(angle::SubjectMessage::ContentsChanged,
+    context->onBufferChanged(this, angle::SubjectMessage::ContentsChanged,
                              mVertexArrayBufferBindingMaskAndContext.getBufferBindingMask(context));
 }
 

src/libANGLE/Context.h

@@ -952,7 +952,8 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
 
     // Only used by vulkan backend.
     void onSwapChainImageChanged() const { mDefaultFramebuffer->onSwapChainImageChanged(); }
-    void onBufferChanged(const angle::SubjectMessage message,
+    void onBufferChanged(const Buffer *buffer,
+                         const angle::SubjectMessage message,
                          VertexArrayBufferBindingMask vertexArrayBufferBindingMask) const
     {
         // Notify current vertex array of the buffer changed. Note that other vertex arrays of this
@@ -961,7 +962,8 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
         if (vertexArrayBufferBindingMask.any())
         {
             ASSERT(mState.mVertexArray != nullptr);
-            mState.mVertexArray->onBufferChanged(this, message, vertexArrayBufferBindingMask);
+            mState.mVertexArray->onBufferChanged(this, buffer, message,
+                                                 vertexArrayBufferBindingMask);
         }
     }
 

src/libANGLE/VertexArray.cpp

@@ -315,14 +315,6 @@ ANGLE_INLINE void VertexArray::updateCachedMappedArrayBuffersBinding(size_t bind
                                          binding.getBoundAttributesMask());
 }
 
-ANGLE_INLINE void VertexArray::updateCachedTransformFeedbackBindingValidation(size_t bindingIndex)
-{
-    const Buffer *buffer = mVertexArrayBuffers[bindingIndex].get();
-    ASSERT(buffer != nullptr);
-    const bool hasConflict = buffer->hasWebGLXFBBindingConflict(true);
-    mCachedBufferPropertyTransformFeedbackConflict.set(bindingIndex, hasConflict);
-}
-
 void VertexArray::bindElementBuffer(const Context *context, Buffer *boundBuffer)
 {
     Buffer *oldBuffer = getElementArrayBuffer();
@@ -660,6 +652,24 @@ angle::Result VertexArray::syncState(const Context *context)
     return angle::Result::Continue;
 }
 
+bool VertexArray::bufferMaskBitsPointToTheSameBuffer(
+    VertexArrayBufferBindingMask bufferBindingMask) const
+{
+    const Buffer *buffer = nullptr;
+    for (size_t bindingIndex : bufferBindingMask)
+    {
+        if (buffer == nullptr)
+        {
+            buffer = mVertexArrayBuffers[bindingIndex].get();
+        }
+        else if (buffer != mVertexArrayBuffers[bindingIndex].get())
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
 // This becomes current vertex array on the context
 void VertexArray::onBind(const Context *context)
 {
@@ -704,7 +714,8 @@ void VertexArray::onBind(const Context *context)
     {
         for (size_t bindingIndex : bufferBindingMask)
         {
-            updateCachedTransformFeedbackBindingValidation(bindingIndex);
+            bool hasConflict = mVertexArrayBuffers[bindingIndex]->hasWebGLXFBBindingConflict(true);
+            mCachedBufferPropertyTransformFeedbackConflict.set(bindingIndex, hasConflict);
         }
     }
 
@@ -845,12 +856,15 @@ void VertexArray::onSharedBufferBind(const Context *context,
 }
 
 void VertexArray::onBufferChanged(const Context *context,
+                                  const Buffer *buffer,
                                   angle::SubjectMessage message,
                                   VertexArrayBufferBindingMask vertexArrayBufferBindingMask)
 {
     VertexArrayBufferBindingMask bufferBindingMask =
         vertexArrayBufferBindingMask & mBufferBindingMask;
+    ASSERT(buffer);
     ASSERT(bufferBindingMask.any());
+    ASSERT(bufferMaskBitsPointToTheSameBuffer(bufferBindingMask));
 
     switch (message)
     {
@@ -861,7 +875,6 @@ void VertexArray::onBufferChanged(const Context *context,
                 VertexBufferBindingMask.reset(kElementArrayBufferIndex);
                 for (size_t bindingIndex : VertexBufferBindingMask)
                 {
-                    const Buffer *buffer = mVertexArrayBuffers[bindingIndex].get();
                     mCachedBufferSize[bindingIndex] = buffer->getSize();
                     updateCachedElementLimit(mState.mVertexBindings[bindingIndex],
                                              mCachedBufferSize[bindingIndex]);
@@ -876,9 +889,15 @@ void VertexArray::onBufferChanged(const Context *context,
             if (context->isWebGL())
             {
                 bufferBindingMask.reset(kElementArrayBufferIndex);
-                for (size_t bindingIndex : bufferBindingMask)
+
+                bool hasConflict = buffer->hasWebGLXFBBindingConflict(true);
+                if (hasConflict)
+                {
+                    mCachedBufferPropertyTransformFeedbackConflict |= bufferBindingMask;
+                }
+                else
                 {
-                    updateCachedTransformFeedbackBindingValidation(bindingIndex);
+                    mCachedBufferPropertyTransformFeedbackConflict &= ~bufferBindingMask;
                 }
             }
             break;

src/libANGLE/VertexArray.h

@@ -382,6 +382,7 @@ class VertexArray final : public VertexArrayPrivate, public LabeledObject, publi
                                 IndexRange *indexRangeOut) const;
 
     void onBufferChanged(const Context *context,
+                         const Buffer *buffer,
                          angle::SubjectMessage message,
                          VertexArrayBufferBindingMask bufferBindingMask);
 
@@ -420,7 +421,7 @@ class VertexArray final : public VertexArrayPrivate, public LabeledObject, publi
     void setDependentDirtyBits(bool contentsChanged,
                                VertexArrayBufferBindingMask bufferBindingMask);
     void updateCachedMappedArrayBuffersBinding(size_t bindingIndex);
-    void updateCachedTransformFeedbackBindingValidation(size_t bindingIndex);
+    bool bufferMaskBitsPointToTheSameBuffer(VertexArrayBufferBindingMask bufferBindingMask) const;
 
     VertexArrayBuffers mVertexArrayBuffers;
     rx::VertexArrayImpl *mVertexArray;