Vulkan: Fold read access into write flags on buffer writes

src/libANGLE/renderer/vulkan/BufferVk.cpp

@@ -162,8 +162,9 @@ angle::Result BufferVk::copySubData(const gl::Context *context,
     // Handle self-dependency especially.
     if (sourceBuffer->mBuffer.getBuffer().getHandle() == mBuffer.getBuffer().getHandle())
     {
-        mBuffer.onSelfReadWrite(contextVk, VK_ACCESS_TRANSFER_READ_BIT,
-                                VK_ACCESS_TRANSFER_WRITE_BIT);
+        // We set the TRANSFER_READ_BIT to be conservative.
+        mBuffer.onSelfReadWrite(contextVk,
+                                VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT);
 
         ANGLE_TRY(mBuffer.recordCommands(contextVk, &commandBuffer));
     }

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -1338,8 +1338,9 @@ void ProgramVk::updateBuffersDescriptorSet(ContextVk *contextVk,
 
         if (isStorageBuffer)
         {
-            bufferHelper.onWrite(contextVk, recorder, VK_ACCESS_SHADER_READ_BIT,
-                                 VK_ACCESS_SHADER_WRITE_BIT);
+            // We set the SHADER_READ_BIT to be conservative.
+            bufferHelper.onWrite(contextVk, recorder,
+                                 VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT);
         }
         else
         {
@@ -1401,8 +1402,9 @@ void ProgramVk::updateAtomicCounterBuffersDescriptorSet(ContextVk *contextVk,
         BufferVk *bufferVk             = vk::GetImpl(bufferBinding.get());
         vk::BufferHelper &bufferHelper = bufferVk->getBuffer();
 
-        bufferHelper.onWrite(contextVk, recorder, VK_ACCESS_SHADER_READ_BIT,
-                             VK_ACCESS_SHADER_WRITE_BIT);
+        // We set SHADER_READ_BIT to be conservative.
+        bufferHelper.onWrite(contextVk, recorder,
+                             VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT);
 
         writtenBindings.set(binding);
     }

src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp

@@ -129,7 +129,7 @@ void TransformFeedbackVk::addFramebufferDependency(ContextVk *contextVk,
         ASSERT(buffer != nullptr);
 
         vk::BufferHelper &bufferHelper = vk::GetImpl(buffer)->getBuffer();
-        bufferHelper.onWrite(contextVk, framebuffer, 0, VK_ACCESS_SHADER_WRITE_BIT);
+        bufferHelper.onWrite(contextVk, framebuffer, VK_ACCESS_SHADER_WRITE_BIT);
     }
 }
 

src/libANGLE/renderer/vulkan/UtilsVk.cpp

@@ -774,7 +774,7 @@ angle::Result UtilsVk::clearBuffer(ContextVk *contextVk,
     ANGLE_TRY(dest->recordCommands(contextVk, &commandBuffer));
 
     // Tell dest it's being written to.
-    dest->onSelfReadWrite(contextVk, 0, VK_ACCESS_SHADER_WRITE_BIT);
+    dest->onSelfReadWrite(contextVk, VK_ACCESS_SHADER_WRITE_BIT);
 
     const vk::Format &destFormat = dest->getViewFormat();
 

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -1473,8 +1473,7 @@ void BufferHelper::release(RendererVk *renderer)
     renderer->collectGarbageAndReinit(&mUse, &mBuffer, &mBufferView, &mDeviceMemory);
 }
 
-bool BufferHelper::needsOnWriteBarrier(VkAccessFlags readAccessType,
-                                       VkAccessFlags writeAccessType,
+bool BufferHelper::needsOnWriteBarrier(VkAccessFlags writeAccessType,
                                        VkAccessFlags *barrierSrcOut,
                                        VkAccessFlags *barrierDstOut)
 {
@@ -1483,20 +1482,18 @@ bool BufferHelper::needsOnWriteBarrier(VkAccessFlags readAccessType,
     // Note: mCurrentReadAccess is not part of barrier src flags as "anything-after-read" is
     // satisified by execution barriers alone.
     *barrierSrcOut = mCurrentWriteAccess;
-    *barrierDstOut = readAccessType | writeAccessType;
+    *barrierDstOut = writeAccessType;
 
     mCurrentWriteAccess = writeAccessType;
-    mCurrentReadAccess  = readAccessType;
+    mCurrentReadAccess  = 0;
 
     return needsBarrier;
 }
 
-void BufferHelper::onWriteAccess(ContextVk *contextVk,
-                                 VkAccessFlags readAccessType,
-                                 VkAccessFlags writeAccessType)
+void BufferHelper::onWriteAccess(ContextVk *contextVk, VkAccessFlags writeAccessType)
 {
     VkAccessFlags barrierSrc, barrierDst;
-    if (needsOnWriteBarrier(readAccessType, writeAccessType, &barrierSrc, &barrierDst))
+    if (needsOnWriteBarrier(writeAccessType, &barrierSrc, &barrierDst))
     {
         addGlobalMemoryBarrier(barrierSrc, barrierDst, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
     }

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -485,13 +485,10 @@ class BufferHelper final : public CommandGraphResource
         addReadDependency(contextVk, reader);
         onReadAccess(reader, readAccessType);
     }
-    void onWrite(ContextVk *contextVk,
-                 CommandGraphResource *writer,
-                 VkAccessFlags readAccessType,
-                 VkAccessFlags writeAccessType)
+    void onWrite(ContextVk *contextVk, CommandGraphResource *writer, VkAccessFlags writeAccessType)
     {
         addWriteDependency(contextVk, writer);
-        onWriteAccess(contextVk, readAccessType, writeAccessType);
+        onWriteAccess(contextVk, writeAccessType);
     }
     // Helper for setting a graph dependency between two buffers.  This is a specialized function as
     // both buffers may incur a memory barrier.  Using |onRead| followed by |onWrite| between the
@@ -503,19 +500,17 @@ class BufferHelper final : public CommandGraphResource
     {
         addReadDependency(contextVk, reader);
         onReadAccess(reader, readAccessType);
-        reader->onWriteAccess(contextVk, 0, writeAccessType);
+        reader->onWriteAccess(contextVk, writeAccessType);
     }
     // Helper for setting a barrier when different parts of the same buffer is being read from and
     // written to in the same command.
-    void onSelfReadWrite(ContextVk *contextVk,
-                         VkAccessFlags readAccessType,
-                         VkAccessFlags writeAccessType)
+    void onSelfReadWrite(ContextVk *contextVk, VkAccessFlags writeAccessType)
     {
         if (mCurrentReadAccess || mCurrentWriteAccess)
         {
             finishCurrentCommands(contextVk);
         }
-        onWriteAccess(contextVk, readAccessType, writeAccessType);
+        onWriteAccess(contextVk, writeAccessType);
     }
     // Set write access mask when the buffer is modified externally, e.g. by host.  There is no
     // graph resource to create a dependency to.
@@ -586,13 +581,10 @@ class BufferHelper final : public CommandGraphResource
                                            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
         }
     }
-    bool needsOnWriteBarrier(VkAccessFlags readAccessType,
-                             VkAccessFlags writeAccessType,
+    bool needsOnWriteBarrier(VkAccessFlags writeAccessType,
                              VkAccessFlags *barrierSrcOut,
                              VkAccessFlags *barrierDstOut);
-    void onWriteAccess(ContextVk *contextVk,
-                       VkAccessFlags readAccessType,
-                       VkAccessFlags writeAccessType);
+    void onWriteAccess(ContextVk *contextVk, VkAccessFlags writeAccessType);
 
     // Vulkan objects.
     Buffer mBuffer;