Revert "Vulkan: Try to merge barriers if possible"

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -591,49 +591,17 @@ void CommandBufferHelper::imageWrite(vk::ResourceUseList *resourceUseList,
 
 void CommandBufferHelper::executeBarriers(vk::PrimaryCommandBuffer *primary)
 {
-    if (mPipelineBarrierMask.none())
+    if (!mPipelineBarrierMask.any())
     {
         return;
     }
 
-    constexpr PipelineStagesMask kHostTransferAndCompute(
-        angle::Bit<uint16_t>(PipelineStage::Host) | angle::Bit<uint16_t>(PipelineStage::Transfer) |
-        angle::Bit<uint16_t>(PipelineStage::ComputeShader));
-
-    // Process Host/Transfer/Compute barriers individually
-    PipelineStagesMask mask = mPipelineBarrierMask & kHostTransferAndCompute;
-    for (PipelineStage pipelineStage : mask)
-    {
-        mPipelineBarriers[pipelineStage].execute(primary);
-    }
-    mPipelineBarrierMask &= ~mask;
-
-    // Graphics pipeline
-    if (mPipelineBarrierMask.none())
+    for (PipelineStage pipelineStage : mPipelineBarrierMask)
     {
-        return;
-    }
-
-    // Now we walk through all stages in graphics pipeline and see if we can merge them without
-    // introducing extra dependency. If the lower stage's dependency already covers the higher
-    // stage's dependency, then we just merge the higher stage into lower stage.
-    mask = mPipelineBarrierMask;
-    PipelineStagesMask::Iterator iter(mask);
-    PipelineBarrier *barrier = &mPipelineBarriers[*iter];
-    mask.reset(*iter);
-    for (PipelineStage pipelineStage : mask)
-    {
-        PipelineBarrier *newBarrier = &mPipelineBarriers[pipelineStage];
-        if (!barrier->mergeIfDependencyStrongerThan(newBarrier))
-        {
-            barrier->execute(primary);
-            barrier = newBarrier;
-        }
+        PipelineBarrier &barrier = mPipelineBarriers[pipelineStage];
+        barrier.writeCommand(primary);
     }
     mPipelineBarrierMask.reset();
-
-    ASSERT(barrier);
-    barrier->execute(primary);
 }
 
 void CommandBufferHelper::beginRenderPass(const vk::Framebuffer &framebuffer,

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -600,7 +600,7 @@ class PipelineBarrier : angle::NonCopyable
 
     bool isEmpty() const { return mImageMemoryBarriers.empty() && mMemoryBarrierSrcAccess == 0; }
 
-    void execute(PrimaryCommandBuffer *primary)
+    void writeCommand(PrimaryCommandBuffer *primary)
     {
         if (isEmpty())
         {
@@ -624,22 +624,6 @@ class PipelineBarrier : angle::NonCopyable
         reset();
     }
 
-    // Merge the other barrier into this one if this barrier's dependency also covers dependency of
-    // the other barrier. Returns true if we actually merged.
-    bool mergeIfDependencyStrongerThan(PipelineBarrier *other)
-    {
-        // If mDstStageMask already has the other's mDstStageMask bits, then merge it
-        bool doMerge = (mDstStageMask == (mDstStageMask | other->mDstStageMask)) ||
-                       // If my dependency is stronger then we can merge
-                       (gl::ScanReverse(mSrcStageMask) >= gl::ScanReverse(other->mSrcStageMask));
-
-        if (doMerge)
-        {
-            merge(other);
-        }
-        return doMerge;
-    }
-
     // merge two barriers into one
     void merge(PipelineBarrier *other)
     {