rhi: vulkan: Fix calling finish() twice with some copy commands in-between

The native command buffer handle was not updated, so the subsequent
finish() call attempted to record an invalid VkCommandBuffer. The
problem was not present with offscreen frames, only when finish() is
called with a swapchain-based frame active.

Task-number: QTBUG-84066
Change-Id: I9c4cb701c3dbbc28f237d6ae1cbf65aafd1fa95f
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index b46b0b819c..e67b249f9c 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -2001,10 +2001,13 @@ QRhi::FrameOpResult QRhiVulkan::finish()
 
     if (inFrame) {
         // Allocate and begin recording on a new command buffer.
-        if (ofr.active)
+        if (ofr.active) {
             startPrimaryCommandBuffer(&ofr.cbWrapper.cb);
-        else
-            startPrimaryCommandBuffer(&swapChainD->frameRes[swapChainD->currentFrameSlot].cmdBuf);
+        } else {
+            QVkSwapChain::FrameResources &frame(swapChainD->frameRes[swapChainD->currentFrameSlot]);
+            startPrimaryCommandBuffer(&frame.cmdBuf);
+            swapChainD->cbWrapper.cb = frame.cmdBuf;
+        }
     }
 
     executeDeferredReleases(true);