From 52cb0fe37576f4d399d3932508d4120394f1494f Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Wed, 4 Jul 2018 20:25:03 +0200 Subject: [PATCH] Vulkan: Fix crash when we get two create_swapchain errors in a row. --- gfx/common/vulkan_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index 19afaa2490..31c7f3d620 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -62,7 +62,7 @@ static void trigger_spurious_error_vkresult(VkResult *res) static bool trigger_spurious_error(void) { ++wsi_harden_counter2; - return (wsi_harden_counter2 & 15) == 9; + return ((wsi_harden_counter2 & 15) == 9) || ((wsi_harden_counter2 & 15) == 10); } #endif @@ -2482,6 +2482,7 @@ retry: vk->context.current_swapchain_index = 0; vulkan_acquire_clear_fences(vk); vulkan_acquire_wait_fences(vk); + vk->context.invalid_swapchain = true; return; } }