Minor fixes

jmorton06 · Nov 14, 2024 · 6b9d644 · 6b9d644
1 parent 3b3ff20
commit 6b9d644
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 12 deletions.
diff --git a/Editor/Source/Editor.cpp b/Editor/Source/Editor.cpp
@@ -989,7 +989,7 @@ namespace Lumos
                 timer = 0.0;
                 stats = Engine::Get().Statistics();
             }
-
+#if 0
             auto size                  = ImGui::CalcTextSize("%.2f ms (%.i FPS)");
             float sizeOfGfxAPIDropDown = ImGui::GetFontSize() * 8;
             ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - size.x - ImGui::GetStyle().ItemSpacing.x * 2.0f - sizeOfGfxAPIDropDown);
@@ -1079,6 +1079,14 @@ namespace Lumos
 
             ImGui::PopStyleColor(2);
             ImGui::PopStyleVar();
+#else
+            auto size = ImGui::CalcTextSize("%.2f ms (%.i FPS)");
+            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - size.x - ImGui::GetStyle().ItemSpacing.x * 2.0f);
+
+            int fps = int(Maths::Round(1000.0 / stats.FrameTime));
+            ImGui::Text("%.2f ms (%.i FPS)", stats.FrameTime, fps);
+            ImGui::PopStyleColor();
+#endif
 
             ImGui::EndMainMenuBar();
         }

diff --git a/Editor/Source/Editor.h b/Editor/Source/Editor.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <string>
 #include <Lumos/Maths/Transform.h>
 #include <Lumos/Utilities/IniFile.h>
 #include <Lumos/Graphics/Camera/EditorCamera.h>

diff --git a/Lumos/Source/Lumos/Core/Application.cpp b/Lumos/Source/Lumos/Core/Application.cpp
@@ -280,6 +280,7 @@ namespace Lumos
         FileSystem::CreateFolderIfDoesntExist(m_ProjectSettings.m_ProjectRoot + "Assets/Prefabs");
         FileSystem::CreateFolderIfDoesntExist(m_ProjectSettings.m_ProjectRoot + "Assets/Materials");
 
+        Graphics::Renderer::GetGraphicsContext()->WaitIdle();
         m_SceneManager = CreateUniquePtr<SceneManager>();
 
         Deserialise();

diff --git a/Lumos/Source/Lumos/Graphics/Renderers/SceneRenderer.cpp b/Lumos/Source/Lumos/Graphics/Renderers/SceneRenderer.cpp
@@ -3966,6 +3966,7 @@ namespace Lumos::Graphics
                 }
 
                 Graphics::CommandBuffer* commandBuffer = Renderer::GetMainSwapChain()->GetCurrentCommandBuffer();
+				commandBuffer->UnBindPipeline();
 
                 currentDescriptors[0] = m_DebugDrawData.m_Renderer2DData.m_DescriptorSet[0][0].get();
                 currentDescriptors[1] = m_DebugDrawData.m_Renderer2DData.m_DescriptorSet[0][1].get();

diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp
@@ -296,9 +296,11 @@ namespace Lumos
             LUMOS_PROFILE_FUNCTION_LOW();
             ASSERT(m_State == CommandBufferState::Submitted);
 
-            m_Fence->WaitAndReset();
             m_State = CommandBufferState::Idle;
 
+            if(!m_Fence->WaitAndReset())
+               return false;
+
             return true;
         }
 

diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKFence.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKFence.cpp
@@ -60,10 +60,10 @@ namespace Lumos
             if(result == VK_SUCCESS)
             {
                 m_Signaled = true;
-                return false;
+                return true;
             }
 
-            return true;
+            return false;
         }
 
         void VKFence::Reset()
@@ -75,13 +75,15 @@ namespace Lumos
             m_Signaled = false;
         }
 
-        void VKFence::WaitAndReset()
+        bool VKFence::WaitAndReset()
         {
-            LUMOS_PROFILE_FUNCTION();
+             LUMOS_PROFILE_FUNCTION();
+            bool succeeded = true;
             if(!IsSignaled())
-                Wait();
+                succeeded = Wait();
 
             Reset();
+            return succeeded;
         }
     }
 }
diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKFence.h b/Lumos/Source/Lumos/Platform/Vulkan/VKFence.h
@@ -17,7 +17,7 @@ namespace Lumos
 
             bool Wait(uint64_t timeoutNanoseconds = 1000000000);
             void Reset();
-            void WaitAndReset();
+            bool WaitAndReset();
 
         private:
             VkFence m_Handle;

diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKSwapChain.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKSwapChain.cpp
@@ -342,6 +342,9 @@ namespace Lumos
             {
                 if(!commandBuffer->Wait())
                 {
+                    //Exit app
+                    LFATAL("Failed to submit command buffer");
+                    Application::Get().SetAppState(AppState::Closing);
                     return;
                 }
             }

diff --git a/Runtime/Runtime.cpp b/Runtime/Runtime.cpp
@@ -1,3 +1,4 @@
+#include <string>
 #include <Lumos/Core/Application.h>
 #include <Lumos/Core/EntryPoint.h>
 #include <Lumos/Core/OS/Window.h>
@@ -10,9 +11,6 @@
 #include <Lumos/Maths/Vector4.h>
 #include <Lumos/Maths/Matrix4.h>
 #include <Lumos/Maths/MathsUtilities.h>
-
-#include <imgui/imgui.h>
-
 #include <imgui/imgui.h>
 
 using namespace Lumos;