Adressing the AMD GPU issue when recreating a SwapChain.

.gitignore

@@ -8,6 +8,8 @@
 # Unfinished scripts
 build.bat
 build.sh
+build_debug.bat
+build_debug.sh
 KaguEngine/assets/shaders/compile.bat
 KaguEngine/assets/shaders/compile.sh
 
@@ -16,4 +18,5 @@ KaguEngine/assets/shaders/compile.sh
 /cmake-build-minsizerel/
 /cmake-build-release/
 /cmake-build-relwithdebinfo/
-/build/
+/build/
+/build_debug/

KaguEngine/src/App.cpp

@@ -51,15 +51,15 @@ void App::run() {
 
     RenderSystem renderSystem{
         m_Device,
-        m_Renderer.getOffscreenFormat(),
-        m_Renderer.getOffscreenDepthFormat(),
+        m_Renderer.getFormat(),
+        m_Renderer.getDepthFormat(),
         m_GlobalSetLayout->getDescriptorSetLayout(),    // set = 0 (UBO)
         m_MaterialSetLayout->getDescriptorSetLayout()   // set = 1 (textures)
     };
     PointLightSystem pointLightSystem{
         m_Device,
-        m_Renderer.getOffscreenFormat(),
-        m_Renderer.getOffscreenDepthFormat(),
+        m_Renderer.getFormat(),
+        m_Renderer.getDepthFormat(),
         m_GlobalSetLayout->getDescriptorSetLayout()
     };
     Camera camera{};
@@ -86,6 +86,12 @@ void App::run() {
         KeyboardMovementController cameraController{};
         glfwPollEvents();
 
+        if (m_Window.windowResized()) {
+            m_Renderer.recreateSwapChain();
+            ImGuiContext::recreateSwapChain();
+            m_Window.resetWindowResizedFlag();
+        }
+
         auto newTime = std::chrono::high_resolution_clock::now();
         float frameTime = std::chrono::duration<float, std::chrono::seconds::period>(newTime - currentTime).count();
         currentTime = newTime;
@@ -121,13 +127,9 @@ void App::run() {
             m_Renderer.endOffscreenRendering(commandBuffer);
 
             // ImGui rendering
-            m_Renderer.transitionOffscreenImageForImGui(commandBuffer);
-            imGuiContext.render(m_Renderer);
-
-            // Present the image
-            m_Renderer.beginSwapChainRendering(commandBuffer);
-            ImGuiContext::onPresent(commandBuffer);
-            m_Renderer.endSwapChainRendering(commandBuffer);
+            m_Renderer.beginRendering(commandBuffer);
+            imGuiContext.render(m_Renderer, commandBuffer);
+            m_Renderer.endRendering(commandBuffer);
 
             m_Renderer.endFrame();
         }

KaguEngine/src/ImGuiContext.cpp

@@ -122,6 +122,10 @@ ImGuiContext::~ImGuiContext() {
     ImGui::DestroyContext();
 }
 
+void ImGuiContext::recreateSwapChain() {
+    ImGui_ImplVulkan_SetMinImageCount(3);
+}
+
 void ImGuiContext::setupConfigFlags() {
     ImGuiIO& io = ImGui::GetIO();
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
@@ -167,9 +171,9 @@ void ImGuiContext::setupContext() const {
     init_info.DescriptorPool = poolRef->getDescriptorPool();
     init_info.Allocator = nullptr;
     init_info.Subpass = 0;
-    init_info.MinImageCount = SwapChain::MAX_FRAMES_IN_FLIGHT;
     init_info.MSAASamples = deviceRef.getSampleCount();
-    init_info.ImageCount = SwapChain::MAX_FRAMES_IN_FLIGHT;
+    init_info.MinImageCount = 3;
+    init_info.ImageCount = 3;
     init_info.UseDynamicRendering = true;
     init_info.PipelineRenderingCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO;
     init_info.PipelineRenderingCreateInfo.colorAttachmentCount = 1;
@@ -226,13 +230,12 @@ void ImGuiContext::setStyleVars() {
     style.ButtonTextAlign   = ImVec2(0.5f, 0.5f);
 }
 
-void ImGuiContext::recreateSwapChain() {
-    ImGui_ImplVulkan_SetMinImageCount(SwapChain::MAX_FRAMES_IN_FLIGHT);
-}
-
-void ImGuiContext::render(const Renderer& renderer) {
+void ImGuiContext::render(const Renderer& renderer, VkCommandBuffer commandBuffer) {
     beginRender();
     onRender(renderer);
+    ImGui::Render();
+    ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), commandBuffer);
+    endRender();
 }
 
 void ImGuiContext::beginRender() {
@@ -367,7 +370,7 @@ void ImGuiContext::render3DScene(const Renderer& renderer) const {
         (viewportSpace.y - renderSize.y) * 0.5f
     };
     ImGui::SetCursorPos(imagePos);
-    ImGui::Image(reinterpret_cast<ImTextureID>(renderer.getOffscreenImGuiDescriptorSet()), renderSize);
+    ImGui::Image(reinterpret_cast<ImTextureID>(renderer.getSceneDescriptorSet()), renderSize);
 
     ImGui::End();
     ImGui::PopStyleVar();
@@ -540,7 +543,7 @@ void ImGuiContext::renderStatusBar() {
             UI_Helpers::ImGui_Text(Config::compiler);
 
             // --- Right Side: Frame Rate ---
-            const std::string framerate = std::to_string(static_cast<int>(ImGui::GetIO().Framerate)) + " FPS";
+            const std::string framerate = std::to_string(static_cast<int>(1.0f / ImGui::GetIO().DeltaTime)) + " FPS";
             // Right-alignment position
             constexpr float internPadding = 8.0f;
             const auto align_pos = ImGui::GetWindowWidth() - ImGui::CalcTextSize(framerate.c_str()).x - ImGui::GetStyle().FramePadding.x - internPadding;
@@ -553,12 +556,6 @@ void ImGuiContext::renderStatusBar() {
     }
 }
 
-void ImGuiContext::onPresent(VkCommandBuffer commandBuffer) {
-    ImGui::Render();
-    ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), commandBuffer);
-    endRender();
-}
-
 void ImGuiContext::endRender() {
     ImGuiIO& io = ImGui::GetIO();
     if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) {

KaguEngine/src/ImGuiContext.ixx

@@ -31,10 +31,8 @@ public:
     );
     ~ImGuiContext();
 
-    static void recreateSwapChain();
-    void render(const Renderer& renderer);
-
-    static void onPresent(VkCommandBuffer commandBuffer);
+    static void recreateSwapChain() ;
+    void render(const Renderer& renderer, VkCommandBuffer commandBuffer);
 
     // Specs
     [[nodiscard]] float getDepth()                  const { return m_MaxDepth[m_CamIdx]; }