Separate dirty bit for attrib's binding VBO change

src/libANGLE/VertexArray.cpp

@@ -457,8 +457,6 @@ ANGLE_INLINE void VertexArray::setVertexAttribPointerImpl(const Context *context
 {
     ASSERT(attribIndex < getMaxAttribs());
 
-    GLintptr offset = boundBuffer ? reinterpret_cast<GLintptr>(pointer) : 0;
-
     VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
 
     SetComponentTypeMask(componentType, attribIndex, &mState.mVertexAttributesTypeMask);
@@ -473,28 +471,35 @@ ANGLE_INLINE void VertexArray::setVertexAttribPointerImpl(const Context *context
     GLsizei effectiveStride =
         stride != 0 ? stride : static_cast<GLsizei>(ComputeVertexAttributeTypeSize(attrib));
 
-    if (pointer != attrib.pointer || attrib.vertexAttribArrayStride != static_cast<GLuint>(stride))
+    if (attrib.vertexAttribArrayStride != static_cast<GLuint>(stride))
     {
         attribDirty = true;
     }
-
-    attrib.pointer                 = pointer;
     attrib.vertexAttribArrayStride = stride;
 
-    // "Pointer buffer" dirty bit disabled because of a bug. http://anglebug.com/3256
-    bindVertexBufferImpl(context, attribIndex, boundBuffer, offset, effectiveStride);
-    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER);
-    ANGLE_UNUSED_VARIABLE(attribDirty);
-
-    // if (bindVertexBufferImpl(context, attribIndex, boundBuffer, offset, effectiveStride) &&
-    //    !attribDirty)
-    //{
-    //    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER_BUFFER);
-    //}
-    // else if (attribDirty)
-    //{
-    //    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER);
-    //}
+    // If we switch from an array buffer to a client pointer(or vice-versa), we set the whole
+    // attribute dirty. This notifies the Vulkan back-end to update all its caches.
+    const VertexBinding &binding = mState.mVertexBindings[attribIndex];
+    if ((boundBuffer == nullptr) != (binding.getBuffer().get() == nullptr))
+    {
+        attribDirty = true;
+    }
+
+    // Change of attrib.pointer is not part of attribDirty. Pointer is actually the buffer offset
+    // which is handled within bindVertexBufferImpl and reflected in bufferDirty.
+    attrib.pointer  = pointer;
+    GLintptr offset = boundBuffer ? reinterpret_cast<GLintptr>(pointer) : 0;
+    const bool bufferDirty =
+        bindVertexBufferImpl(context, attribIndex, boundBuffer, offset, effectiveStride);
+
+    if (attribDirty)
+    {
+        setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER);
+    }
+    else if (bufferDirty)
+    {
+        setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER_BUFFER);
+    }
 
     mState.mNullPointerClientMemoryAttribsMask.set(attribIndex,
                                                    boundBuffer == nullptr && pointer == nullptr);

src/libANGLE/renderer/vulkan/VertexArrayVk.h

@@ -108,11 +108,8 @@ class VertexArrayVk : public VertexArrayImpl
     angle::Result syncDirtyAttrib(ContextVk *contextVk,
                                   const gl::VertexAttribute &attrib,
                                   const gl::VertexBinding &binding,
-                                  size_t attribIndex);
-
-    void syncDirtyBuffer(ContextVk *contextVk,
-                         const gl::VertexBinding &binding,
-                         size_t bindingIndex);
+                                  size_t attribIndex,
+                                  bool bufferOnly);
 
     gl::AttribArray<VkBuffer> mCurrentArrayBufferHandles;
     gl::AttribArray<VkDeviceSize> mCurrentArrayBufferOffsets;