Fix some stuff

destrum/src/Graphics/Swapchain.cpp

@@ -65,40 +65,72 @@ void Swapchain::createSwapchain(GfxDevice* gfxDevice, VkFormat format, std::uint
     extent = m_swapchain.extent;
 }
 
-void Swapchain::recreateSwapchain(const GfxDevice& gfxDevice, VkFormat format, std::uint32_t width, std::uint32_t height, bool vSync) {
-    assert(m_swapchain);
+void Swapchain::recreateSwapchain(
+    const GfxDevice& gfxDevice,
+    VkFormat format,
+    std::uint32_t width,
+    std::uint32_t height,
+    bool vSync)
+{
+    if (width == 0 || height == 0) {
+        dirty = true;
+        return;
+    }
+
+    VkDevice device = gfxDevice.getDevice();
+
+    vkDeviceWaitIdle(device);
+
+    auto oldSwapchain = m_swapchain;
+
+    auto res = vkb::SwapchainBuilder{gfxDevice.getVkbDevice()}
+    .set_old_swapchain(oldSwapchain)
+    .set_desired_format(VkSurfaceFormatKHR{
+        .format = format,
+        .colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
+    })
+    .add_image_usage_flags(VK_IMAGE_USAGE_TRANSFER_DST_BIT)
+    .set_desired_present_mode(
+        vSync ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_IMMEDIATE_KHR)
+    .set_desired_extent(width, height)
+    .build();
 
-    assert(format == VK_FORMAT_B8G8R8A8_SRGB && "TODO: test other formats");
-    auto res = vkb::SwapchainBuilder{gfxDevice.getDevice()}
-            .set_old_swapchain(m_swapchain)
-            .set_desired_format(VkSurfaceFormatKHR{
-                .format = format,
-                .colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
-            })
-            .add_image_usage_flags(VK_IMAGE_USAGE_TRANSFER_DST_BIT)
-            .set_desired_present_mode(
-                vSync ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_IMMEDIATE_KHR)
-            .set_desired_extent(width, height)
-            .build();
     if (!res.has_value()) {
         throw std::runtime_error(std::format(
             "failed to create swapchain: error = {}, vk result = {}",
             res.full_error().type.message(),
             string_VkResult(res.full_error().vk_result)));
     }
-    vkb::destroy_swapchain(m_swapchain);
 
-    for (auto imageView: imageViews) {
-        vkDestroyImageView(m_gfxDevice->getDevice(), imageView, nullptr);
+    for (auto sem : imageRenderSemaphores) {
+        vkDestroySemaphore(device, sem, nullptr);
     }
+    imageRenderSemaphores.clear();
+
+    for (auto imageView : imageViews) {
+        vkDestroyImageView(device, imageView, nullptr);
+    }
+    imageViews.clear();
+
+    vkb::destroy_swapchain(oldSwapchain);
 
     m_swapchain = res.value();
 
     images = m_swapchain.get_images().value();
     imageViews = m_swapchain.get_image_views().value();
 
-    dirty = false;
+    VkSemaphoreCreateInfo sci{
+        .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
+    };
+
+    imageRenderSemaphores.resize(images.size());
+
+    for (auto& sem : imageRenderSemaphores) {
+        VK_CHECK(vkCreateSemaphore(device, &sci, nullptr, &sem));
+    }
+
     extent = m_swapchain.extent;
+    dirty = false;
 }
 
 void Swapchain::cleanup() {
@@ -126,6 +158,12 @@ void Swapchain::resetFences(int index) const {
     VK_CHECK(vkResetFences(m_gfxDevice->getDevice(), 1, &frame.renderFence));
 }
 
+struct SwapchainAcquireResult {
+    VkResult result = VK_SUCCESS;
+    VkImage image = VK_NULL_HANDLE;
+    uint32_t imageIndex = 0;
+};
+
 std::pair<VkImage, int> Swapchain::acquireNextImage(int index) {
     std::uint32_t swapchainImageIndex{};
     const auto result = vkAcquireNextImageKHR(