Vulkan: Check that its okay to add commands

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -4726,6 +4726,7 @@ angle::Result ContextVk::flushCommandsAndEndRenderPass()
 
     if (mRenderer->getFeatures().enableCommandProcessingThread.enabled)
     {
+        mRenderPassCommands->markClosed();
         vk::CommandProcessorTask task = {this, &mPrimaryCommands, mRenderPassCommands};
         ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::flushInsideRenderPassCommands");
         queueCommandsToWorker(task);
@@ -4768,6 +4769,7 @@ void ContextVk::getNextAvailableCommandBuffer(vk::CommandBufferHelper **commandB
     mAvailableCommandBuffers.pop();
     lock.unlock();
     (*commandBuffer)->setHasRenderPass(hasRenderPass);
+    (*commandBuffer)->markOpen();
 }
 
 void ContextVk::recycleCommandBuffer(vk::CommandBufferHelper *commandBuffer)
@@ -4865,6 +4867,7 @@ angle::Result ContextVk::flushOutsideRenderPassCommands()
 
     if (mRenderer->getFeatures().enableCommandProcessingThread.enabled)
     {
+        mOutsideRenderPassCommands->markClosed();
         vk::CommandProcessorTask task = {this, &mPrimaryCommands, mOutsideRenderPassCommands};
         ANGLE_TRACE_EVENT0("gpu.angle", "ContextVk::flushOutsideRenderPassCommands");
         queueCommandsToWorker(task);

src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h

@@ -688,6 +688,9 @@ class SecondaryCommandBuffer final : angle::NonCopyable
         reinterpret_cast<CommandHeader *>(mCurrentWritePointer)->id = CommandID::Invalid;
     }
 
+    void open() { mIsOpen = true; }
+    void close() { mIsOpen = false; }
+
     void reset()
     {
         mCommands.clear();
@@ -716,6 +719,7 @@ class SecondaryCommandBuffer final : angle::NonCopyable
     template <class StructType>
     ANGLE_INLINE StructType *commonInit(CommandID cmdID, size_t allocationSize)
     {
+        ASSERT(mIsOpen);
         mCurrentBytesRemaining -= allocationSize;
 
         CommandHeader *header = reinterpret_cast<CommandHeader *>(mCurrentWritePointer);
@@ -798,6 +802,9 @@ class SecondaryCommandBuffer final : angle::NonCopyable
         return writePointer + sizeInBytes;
     }
 
+    // flag to indicate that commandBuffer is open for new commands
+    bool mIsOpen;
+
     std::vector<CommandHeader *> mCommands;
 
     // Allocator used by this class. If non-null then the class is valid.

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -957,6 +957,18 @@ class CommandBufferHelper : angle::NonCopyable
     void executeBarriers(ContextVk *contextVk, PrimaryCommandBuffer *primary);
 
     void setHasRenderPass(bool hasRenderPass) { mIsRenderPassCommandBuffer = hasRenderPass; }
+
+    // The markOpen and markClosed functions are to aid in proper use of the CommandBufferHelper.
+    // saw invalid use due to threading issues that can be easily caught by marking when it's safe
+    // (open) to write to the commandbuffer.
+#if defined(ANGLE_ENABLE_ASSERTS)
+    void markOpen() { mCommandBuffer.open(); }
+    void markClosed() { mCommandBuffer.close(); }
+#else
+    void markOpen() {}
+    void markClosed() {}
+#endif
+
     void reset();
     void releaseToContextQueue(ContextVk *contextVk);