VulkanDevice: Fix crash on shutdown if swapchain creation fails

2 months ago · 1bf076c74f
parent e0877c1922
commit 1bf076c74f
1 changed files with 3 additions and 0 deletions
--- a/src/util/vulkan_device.cpp
+++ b/src/util/vulkan_device.cpp
@ -1995,8 +1995,11 @@ bool VulkanDevice::CreateDeviceAndMainSwapChain(std::string_view adapter, Featur
    swap_chain =
      std::make_unique<VulkanSwapChain>(wi, vsync_mode, allow_present_throttle, exclusive_fullscreen_control);
    if (!swap_chain->CreateSurface(m_instance, m_physical_device, error))
+    {
+      swap_chain->Destroy(*this, false);
      return false;
    }
+  }

  // Attempt to create the device.
  if (!CreateDevice(swap_chain ? swap_chain->GetSurface() : VK_NULL_HANDLE, enable_validation_layer, disabled_features,