From 2fe1f3c2f768cff15c307115c5d7a8dc45de8d40 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Mon, 17 May 2021 15:04:14 +1000
Subject: [PATCH] VulkanHostDisplay: Wait for GPU idle on surface change

---
 src/frontend-common/vulkan_host_display.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/frontend-common/vulkan_host_display.cpp b/src/frontend-common/vulkan_host_display.cpp
index f28a71ad4..84efeaffb 100644
--- a/src/frontend-common/vulkan_host_display.cpp
+++ b/src/frontend-common/vulkan_host_display.cpp
@@ -72,6 +72,8 @@ void* VulkanHostDisplay::GetRenderContext() const
 
 bool VulkanHostDisplay::ChangeRenderWindow(const WindowInfo& new_wi)
 {
+  g_vulkan_context->WaitForGPUIdle();
+
   if (new_wi.type == WindowInfo::Type::Surfaceless)
   {
     g_vulkan_context->ExecuteCommandBuffer(true);