xo-imgui: refactor ex4a: cleanup() etc.

xo-imgui/example/ex4a/VulkanApp.cpp

@@ -623,4 +623,92 @@ MinimalImGuiVulkan::record_command_buffer(VkCommandBuffer cmdbuf, uint32_t image
     }
 }
 
+void
+MinimalImGuiVulkan::recreate_swapchain()
+{
+    // handle window minimization: wait until window has valid size
+    this->wait_not_minimized();
+
+    // wait until device idle before cleaning up resources
+    vkDeviceWaitIdle(device_);
+
+    // cleanup old swapchain
+    this->cleanup_framebuffers();
+    this->cleanup_image_views();
+    this->cleanup_swapchain();
+
+    // create new swapchain
+    this->create_swapchain();
+    this->create_image_views();
+    this->create_framebuffers();
+}
+
+void
+MinimalImGuiVulkan::wait_not_minimized()
+{
+    int width = 0;
+    int height = 0;
+    SDL_GetWindowSize(window_, &width, &height);
+    while (width == 0 || height == 0) {
+        SDL_GetWindowSize(window_, &width, &height);
+        SDL_WaitEvent(nullptr);
+    }
+}
+
+void
+MinimalImGuiVulkan::cleanup_framebuffers()
+{
+    for (auto framebuffer : framebuffers_) {
+        vkDestroyFramebuffer(device_, framebuffer, nullptr);
+    }
+    framebuffers_.clear();
+}
+
+void
+MinimalImGuiVulkan::cleanup_image_views()
+{
+    for (auto imageView : swapchain_image_views_) {
+        vkDestroyImageView(device_, imageView, nullptr);
+    }
+    swapchain_image_views_.clear();
+}
+
+void
+MinimalImGuiVulkan::cleanup_swapchain()
+{
+    vkDestroySwapchainKHR(device_, this->swapchain_, nullptr);
+}
+
+void
+MinimalImGuiVulkan::cleanup()
+{
+    ImGui_ImplVulkan_Shutdown();
+    ImGui_ImplSDL2_Shutdown();
+    ImGui::DestroyContext();
+
+    for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
+        vkDestroySemaphore(device_, render_finished_semaphores_[i], nullptr);
+        vkDestroySemaphore(device_, image_available_semaphores_[i], nullptr);
+        vkDestroyFence(device_, inflight_fences_[i], nullptr);
+    }
+
+    vkDestroyCommandPool(device_, command_pool_, nullptr);
+
+    this->cleanup_framebuffers();
+    this->cleanup_image_views();
+    this->cleanup_swapchain();
+
+    vkDestroyRenderPass(device_, render_pass_, nullptr);
+    vkDestroyDescriptorPool(device_, descriptor_pool_, nullptr);
+    vkDestroyDevice(device_, nullptr);
+    vkDestroySurfaceKHR(instance_, this->surface_, nullptr);
+    vkDestroyInstance(instance_, nullptr);
+    this->instance_ = nullptr;
+
+    SDL_DestroyWindow(window_);
+    this->window_ = nullptr;
+
+    SDL_Quit();
+}
+
 /* end VulkanApp.cpp */

xo-imgui/example/ex4a/VulkanApp.hpp

@@ -120,81 +120,25 @@ private:
     /* record draw instructions into cmdbuf, framebuffers_[image_ix] */
     void record_command_buffer(VkCommandBuffer commandBuffer, uint32_t image_ix);
 
-    void recreate_swapchain() {
+    /* Teardown + create swapchain (swapchain + framebuffers + image views).
-        // handle window minimization: wait until window has valid size
+     * Need this after window size changes
-        this->wait_not_minimized();
+     */
+    void recreate_swapchain();
 
-        // wait until device idle before cleaning up resources
+    /* wait until non-minimized window */
-        vkDeviceWaitIdle(device_);
+    void wait_not_minimized();
 
-        // cleanup old swapchain
+    /* orderly disposal of @ref framebuffers_ */
-        this->cleanup_framebuffers();
+    void cleanup_framebuffers();
-        this->cleanup_image_views();
-        this->cleanup_swapchain();
 
-        // create new swapchain
+    /* orderly disposal of @ref swapchain_image_views_ */
-        this->create_swapchain();
+    void cleanup_image_views();
-        this->create_image_views();
-        this->create_framebuffers();
-    }
 
-    void wait_not_minimized() {
+    /* orderly disposal of @ref swapchain_ */
-        int width = 0;
+    void cleanup_swapchain();
-        int height = 0;
-        SDL_GetWindowSize(window_, &width, &height);
-        while (width == 0 || height == 0) {
-            SDL_GetWindowSize(window_, &width, &height);
-            SDL_WaitEvent(nullptr);
-        }
-    }
 
-    void cleanup_framebuffers() {
+    /* orderly shutdown */
-            for (auto framebuffer : framebuffers_) {
+    void cleanup();
-                vkDestroyFramebuffer(device_, framebuffer, nullptr);
-            }
-            framebuffers_.clear();
-    }
-
-    void cleanup_image_views() {
-            for (auto imageView : swapchain_image_views_) {
-                vkDestroyImageView(device_, imageView, nullptr);
-            }
-            swapchain_image_views_.clear();
-    }
-
-    void cleanup_swapchain() {
-        vkDestroySwapchainKHR(device_, this->swapchain_, nullptr);
-    }
-
-    void cleanup() {
-        ImGui_ImplVulkan_Shutdown();
-        ImGui_ImplSDL2_Shutdown();
-        ImGui::DestroyContext();
-
-        for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
-            vkDestroySemaphore(device_, render_finished_semaphores_[i], nullptr);
-            vkDestroySemaphore(device_, image_available_semaphores_[i], nullptr);
-            vkDestroyFence(device_, inflight_fences_[i], nullptr);
-        }
-
-        vkDestroyCommandPool(device_, command_pool_, nullptr);
-
-        this->cleanup_framebuffers();
-        this->cleanup_image_views();
-        this->cleanup_swapchain();
-
-        vkDestroyRenderPass(device_, render_pass_, nullptr);
-        vkDestroyDescriptorPool(device_, descriptor_pool_, nullptr);
-        vkDestroyDevice(device_, nullptr);
-        vkDestroySurfaceKHR(instance_, this->surface_, nullptr);
-        vkDestroyInstance(instance_, nullptr);
-        this->instance_ = nullptr;
-
-        SDL_DestroyWindow(window_);
-        this->window_ = nullptr;
-
-        SDL_Quit();
-    }
 
 private:
     SDL_Window* window_ = nullptr;