Vulkan: Remove mWaitSemaphores from ContextVk

With per context command buffer in earlier CL, we no longer needs to
store mWaitSemaphores in ContextVk any more, they could be stored in
CommandState directly. flushWaitSemaphores() API is completely removed
in this CL since there is no need for such flush any more.

Bug: b/447633563
Change-Id: Ifa73657cd6bd9ca76a764db1b49cac11cdfec0f7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7132482
Commit-Queue: Charlie Lao <cclao@google.com>
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Author: cclao

src/libANGLE/renderer/vulkan/CommandQueue.cpp

@@ -574,25 +574,10 @@ void CommandsState::destroy(VkDevice device)
     mSecondaryCommands.releaseCommandBuffers();
 }
 
-void CommandsState::flushWaitSemaphores(ProtectionType protectionType,
-                                        std::vector<VkSemaphore> &&waitSemaphores,
-                                        std::vector<VkPipelineStageFlags> &&waitSemaphoreStageMasks)
-{
-    ANGLE_TRACE_EVENT0("gpu.angle", "Renderer::flushWaitSemaphores");
-    ASSERT(!waitSemaphores.empty());
-    ASSERT(waitSemaphores.size() == waitSemaphoreStageMasks.size());
-    std::lock_guard<angle::SimpleMutex> lock(mCmdPoolMutex);
-
-    mWaitSemaphores.insert(mWaitSemaphores.end(), waitSemaphores.begin(), waitSemaphores.end());
-    mWaitSemaphoreStageMasks.insert(mWaitSemaphoreStageMasks.end(), waitSemaphoreStageMasks.begin(),
-                                    waitSemaphoreStageMasks.end());
-
-    waitSemaphores.clear();
-    waitSemaphoreStageMasks.clear();
-}
-
 angle::Result CommandsState::getCommandsAndWaitSemaphores(
     ErrorContext *context,
+    CommandPoolAccess *commandPoolAccess,
+    CommandBatch *batch,
     std::vector<VkSemaphore> *waitSemaphoresOut,
     std::vector<VkPipelineStageFlags> *waitSemaphoreStageMasksOut)
 {
@@ -606,6 +591,10 @@ angle::Result CommandsState::getCommandsAndWaitSemaphores(
         ANGLE_VK_TRY(context, mPrimaryCommands.end());
     }
 
+    batch->setPrimaryCommands(std::move(mPrimaryCommands), commandPoolAccess);
+    // Store secondary Command Buffers.
+    batch->setSecondaryCommands(std::move(mSecondaryCommands));
+
     // Store wait semaphores.
     *waitSemaphoresOut          = std::move(mWaitSemaphores);
     *waitSemaphoreStageMasksOut = std::move(mWaitSemaphoreStageMasks);
@@ -876,12 +865,8 @@ angle::Result CommandQueue::submitCommands(ErrorContext *context,
     std::vector<VkSemaphore> waitSemaphores;
     std::vector<VkPipelineStageFlags> waitSemaphoreStageMasks;
 
-    ANGLE_TRY(commandsState.getCommandsAndWaitSemaphores(context, &waitSemaphores,
-                                                         &waitSemaphoreStageMasks));
-
-    batch.setPrimaryCommands(std::move(*commandsState.getPrimaryCommands()), &mCommandPoolAccess);
-    // Store secondary Command Buffers.
-    batch.setSecondaryCommands(std::move(*commandsState.getSecondaryCommands()));
+    ANGLE_TRY(commandsState.getCommandsAndWaitSemaphores(
+        context, &mCommandPoolAccess, &batch, &waitSemaphores, &waitSemaphoreStageMasks));
 
     mPerfCounters.commandQueueWaitSemaphoresTotal += waitSemaphores.size();
 

src/libANGLE/renderer/vulkan/CommandQueue.h

@@ -223,10 +223,6 @@ class CommandsState : angle::NonCopyable
                                           VkFramebuffer framebufferOverride,
                                           RenderPassCommandBufferHelper **renderPassCommands);
 
-    void flushWaitSemaphores(ProtectionType protectionType,
-                             std::vector<VkSemaphore> &&waitSemaphores,
-                             std::vector<VkPipelineStageFlags> &&waitSemaphoreStageMasks);
-
     void flushImagesTransitionToForeign(
         std::vector<VkImageMemoryBarrier> &&imagesToTransitionToForeign)
     {
@@ -244,6 +240,8 @@ class CommandsState : angle::NonCopyable
 
     angle::Result getCommandsAndWaitSemaphores(
         ErrorContext *context,
+        CommandPoolAccess *commandPoolAccess,
+        CommandBatch *batch,
         std::vector<VkSemaphore> *waitSemaphoresOut,
         std::vector<VkPipelineStageFlags> *waitSemaphoreStageMasksOut);
 
@@ -256,6 +254,8 @@ class CommandsState : angle::NonCopyable
     PrimaryCommandBuffer *getPrimaryCommands() { return &mPrimaryCommands; }
     SecondaryCommandBufferCollector *getSecondaryCommands() { return &mSecondaryCommands; }
 
+    bool hasWaitSemaphoresPendingSubmission() const { return !mWaitSemaphores.empty(); }
+
   private:
     angle::Result ensurePrimaryCommandBufferValidLocked(ErrorContext *context,
                                                         const ProtectionType &protectionType);

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -862,7 +862,6 @@ ContextVk::ContextVk(const gl::State &state, gl::ErrorSet *errorSet, vk::Rendere
       mTotalBufferToImageCopySize(0),
       mEstimatedPendingImageGarbageSize(0),
       mRenderPassCountSinceSubmit(0),
-      mHasWaitSemaphoresPendingSubmission(false),
       mGpuClockSync{std::numeric_limits<double>::max(), std::numeric_limits<double>::max()},
       mGpuEventTimestampOrigin(0),
       mInitialContextPriority(renderer->getDriverPriority(GetContextPriority(state))),
@@ -6272,8 +6271,7 @@ angle::Result ContextVk::onSurfaceUnMakeCurrent(WindowSurfaceVk *surface)
     // Everything must be flushed and submitted.
     ASSERT(mOutsideRenderPassCommands->empty());
     ASSERT(!mRenderPassCommands->started());
-    ASSERT(mWaitSemaphores.empty());
-    ASSERT(!mHasWaitSemaphoresPendingSubmission);
+    ASSERT(!mCommandState.hasWaitSemaphoresPendingSubmission());
     ASSERT(mLastSubmittedQueueSerial == mLastFlushedQueueSerial);
     return angle::Result::Continue;
 }
@@ -6300,7 +6298,7 @@ angle::Result ContextVk::onSurfaceUnMakeCurrent(OffscreenSurfaceVk *surface)
     // Everything must be flushed but may be pending submission.
     ASSERT(mOutsideRenderPassCommands->empty());
     ASSERT(!mRenderPassCommands->started());
-    ASSERT(mWaitSemaphores.empty());
+    ASSERT(!mCommandState.hasWaitSemaphoresPendingSubmission());
     return angle::Result::Continue;
 }
 
@@ -7805,7 +7803,7 @@ angle::Result ContextVk::flushAndSubmitCommands(const vk::Semaphore *signalSemap
     bool someCommandAlreadyFlushedNeedsSubmit =
         mLastFlushedQueueSerial != mLastSubmittedQueueSerial;
     bool someOtherReasonNeedsSubmit = signalSemaphore != nullptr || externalFence != nullptr ||
-                                      mHasWaitSemaphoresPendingSubmission ||
+                                      mCommandState.hasWaitSemaphoresPendingSubmission() ||
                                       hasForeignImagesToTransition();
 
     if (!someCommandsNeedFlush && !someCommandAlreadyFlushedNeedsSubmit &&
@@ -7888,18 +7886,15 @@ angle::Result ContextVk::flushAndSubmitCommands(const vk::Semaphore *signalSemap
         mHasInFlightStreamedVertexBuffers.reset();
     }
 
-    ASSERT(mWaitSemaphores.empty());
-    ASSERT(mWaitSemaphoreStageMasks.empty());
-
     prepareToSubmitAllCommands();
     ANGLE_TRY(submitCommands(signalSemaphore, externalFence));
     mCommandsPendingSubmissionCount = 0;
     mRenderPassCountSinceSubmit     = 0;
 
+    ASSERT(!mCommandState.hasWaitSemaphoresPendingSubmission());
     ASSERT(mOutsideRenderPassCommands->getQueueSerial() > mLastSubmittedQueueSerial);
 
     mHasAnyCommandsPendingSubmission    = false;
-    mHasWaitSemaphoresPendingSubmission = false;
     onRenderPassFinished(RenderPassClosureReason::AlreadySpecifiedElsewhere);
 
     if (mGpuEventsEnabled)
@@ -7948,13 +7943,6 @@ angle::Result ContextVk::finishImpl(RenderPassClosureReason renderPassClosureRea
     return angle::Result::Continue;
 }
 
-void ContextVk::addWaitSemaphore(VkSemaphore semaphore, VkPipelineStageFlags stageMask)
-{
-    mWaitSemaphores.push_back(semaphore);
-    mWaitSemaphoreStageMasks.push_back(stageMask);
-    mHasWaitSemaphoresPendingSubmission = true;
-}
-
 angle::Result ContextVk::getCompatibleRenderPass(const vk::RenderPassDesc &desc,
                                                  const vk::RenderPass **renderPassOut)
 {
@@ -8545,15 +8533,6 @@ angle::Result ContextVk::flushAndSubmitOutsideRenderPassCommands()
 
 angle::Result ContextVk::flushOutsideRenderPassCommands()
 {
-    if (!mWaitSemaphores.empty())
-    {
-        ASSERT(mHasWaitSemaphoresPendingSubmission);
-        mCommandState.flushWaitSemaphores(getProtectionType(), std::move(mWaitSemaphores),
-                                          std::move(mWaitSemaphoreStageMasks));
-    }
-    ASSERT(mWaitSemaphores.empty());
-    ASSERT(mWaitSemaphoreStageMasks.empty());
-
     if (mOutsideRenderPassCommands->empty())
     {
         return angle::Result::Continue;

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -479,7 +479,10 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
 
     angle::Result finishImpl(RenderPassClosureReason renderPassClosureReason);
 
-    void addWaitSemaphore(VkSemaphore semaphore, VkPipelineStageFlags stageMask);
+    void addWaitSemaphore(VkSemaphore semaphore, VkPipelineStageFlags stageMask)
+    {
+        mCommandState.addWaitSemaphore(semaphore, stageMask);
+    }
 
     template <typename T>
     void addGarbage(T *object)
@@ -1675,13 +1678,6 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
     // The number of render passes since the last submission of all commands.
     VkDeviceSize mRenderPassCountSinceSubmit;
 
-    // Semaphores that must be flushed before the current commands. Flushed semaphores will be
-    // waited on in the next submission.
-    std::vector<VkSemaphore> mWaitSemaphores;
-    std::vector<VkPipelineStageFlags> mWaitSemaphoreStageMasks;
-    // Whether this context has wait semaphores (flushed and unflushed) that must be submitted.
-    bool mHasWaitSemaphoresPendingSubmission;
-
     // Hold information from the last gpu clock sync for future gpu-to-cpu timestamp conversions.
     GpuClockSyncInfo mGpuClockSync;