source/blender/gpu/vulkan/vk_command_buffers.cc

@@ -350,7 +350,7 @@ void VKCommandBuffers::dispatch(VKStorageBuffer &command_storage_buffer)
 
   VKCommandBuffer &command_buffer = command_buffer_get(Type::Compute);
   vkCmdDispatchIndirect(command_buffer.vk_command_buffer(), command_storage_buffer.vk_handle(), 0);
-  command_buffer.commands_submitted();
+  command_buffer.command_recorded();
 }
 
 void VKCommandBuffers::copy(VKBuffer &dst_buffer,

source/blender/gpu/vulkan/vk_context.cc

@@ -238,6 +238,12 @@ void VKContext::swap_buffers_post_callback()
 
 void VKContext::swap_buffers_pre_handler(const GHOST_VulkanSwapChainData &swap_chain_data)
 {
+  /*
+   * Ensure no graphics/compute commands are scheduled. They could use the back buffer, which
+   * layout is altered here.
+   */
+  command_buffers_get().submit();
+
   VKFrameBuffer &framebuffer = *unwrap(back_left);
 
   VKTexture wrapper("display_texture");
@@ -247,7 +253,6 @@ void VKContext::swap_buffers_pre_handler(const GHOST_VulkanSwapChainData &swap_c
   wrapper.layout_ensure(*this, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
   framebuffer.color_attachment_layout_ensure(*this, 0, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
   VKTexture *color_attachment = unwrap(unwrap(framebuffer.color_tex(0)));
-  color_attachment->layout_ensure(*this, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
   VkImageBlit image_blit = {};
   image_blit.srcOffsets[0] = {0, color_attachment->height_get() - 1, 0};

source/blender/gpu/vulkan/vk_framebuffer.cc

@@ -380,7 +380,6 @@ void VKFrameBuffer::blit_to(eGPUFrameBufferBits planes,
                   VK_IMAGE_ASPECT_DEPTH_BIT);
     }
   }
-  context.flush();
 }
 
 /** \} */