Rethinking Rendering

Tetragrama/Components/AboutUIComponent.h

@@ -10,7 +10,7 @@ namespace Tetragrama::Components
         AboutUIComponent(std::string_view name = "AboutUIComponent", bool visibility = true) : UIComponent(name, visibility, true) {}
         virtual ~AboutUIComponent() = default;
 
-        virtual void Render() override
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override
         {
             ImGui::ShowAboutWindow(&m_is_open);
         }

Tetragrama/Components/DemoUIComponent.h

@@ -10,7 +10,7 @@ namespace Tetragrama::Components
         DemoUIComponent(std::string_view name = "DemoUIComponent", bool visibility = true) : UIComponent(name, visibility, true) {}
         virtual ~DemoUIComponent() = default;
 
-        virtual void Render() override
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override
         {
             ImGui::ShowDemoWindow(&m_is_open);
         }

Tetragrama/Components/DockspaceUIComponent.cpp

@@ -72,7 +72,7 @@ namespace Tetragrama::Components
 
     void DockspaceUIComponent::Update(ZEngine::Core::TimeStep dt) {}
 
-    void DockspaceUIComponent::Render()
+    void DockspaceUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         const ImGuiViewport* viewport = ImGui::GetMainViewport();
         ImGui::SetNextWindowPos(viewport->Pos);

Tetragrama/Components/DockspaceUIComponent.h

@@ -14,7 +14,7 @@ namespace Tetragrama::Components
         virtual ~DockspaceUIComponent();
 
         void         Update(ZEngine::Core::TimeStep dt) override;
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         void RenderMenuBar();
         void RenderSaveScene();

Tetragrama/Components/HierarchyViewUIComponent.cpp

@@ -59,7 +59,7 @@ namespace Tetragrama::Components
         co_return;
     }
 
-    void HierarchyViewUIComponent::Render()
+    void HierarchyViewUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         ImGui::Begin(m_name.c_str(), (m_can_be_closed ? &m_can_be_closed : NULL), ImGuiWindowFlags_NoCollapse);
         if (ImGui::BeginPopupContextWindow(m_name.c_str()))

Tetragrama/Components/HierarchyViewUIComponent.h

@@ -16,7 +16,7 @@ namespace Tetragrama::Components
         virtual ~HierarchyViewUIComponent();
 
         void         Update(ZEngine::Core::TimeStep dt) override;
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         void RenderTreeNodes();
         void RenderGuizmo();

Tetragrama/Components/InspectorViewUIComponent.cpp

@@ -76,7 +76,7 @@ namespace Tetragrama::Components
         co_return;
     }
 
-    void InspectorViewUIComponent::Render()
+    void InspectorViewUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         if (m_recieved_deleted_request || m_recieved_unselected_request)
         {

Tetragrama/Components/InspectorViewUIComponent.h

@@ -18,7 +18,7 @@ namespace Tetragrama::Components
 
         void Update(ZEngine::Core::TimeStep dt) override;
 
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
     public:
         std::future<void> SceneAvailableMessageHandlerAsync(Messengers::GenericMessage<ZEngine::Helpers::Ref<ZEngine::Rendering::Scenes::GraphicScene>>&);

Tetragrama/Components/LogUIComponent.cpp

@@ -24,7 +24,7 @@ namespace Tetragrama::Components
         }
     }
 
-    void LogUIComponent::Render()
+    void LogUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         ImGui::Begin(m_name.c_str(), (m_can_be_closed ? &m_can_be_closed : NULL), ImGuiWindowFlags_NoCollapse);
 

Tetragrama/Components/LogUIComponent.h

@@ -12,7 +12,7 @@ namespace Tetragrama::Components
         virtual ~LogUIComponent();
 
         virtual void Update(ZEngine::Core::TimeStep dt) override;
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         void OnLog(ZEngine::Logging::LogMessage);
 

Tetragrama/Components/ProjectViewUIComponent.cpp

@@ -10,7 +10,7 @@ namespace Tetragrama::Components
 
     void ProjectViewUIComponent::Update(ZEngine::Core::TimeStep dt) {}
 
-    void ProjectViewUIComponent::Render()
+    void ProjectViewUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         ImGui::Begin(m_name.c_str(), (m_can_be_closed ? &m_can_be_closed : NULL), ImGuiWindowFlags_NoCollapse);
 

Tetragrama/Components/ProjectViewUIComponent.h

@@ -12,6 +12,6 @@ namespace Tetragrama::Components
 
         void Update(ZEngine::Core::TimeStep dt) override;
 
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
     };
 } // namespace Tetragrama::Components

Tetragrama/Components/SceneViewportUIComponent.cpp

@@ -34,17 +34,6 @@ namespace Tetragrama::Components
             m_request_renderer_resize = true;
         }
 
-        if (m_request_renderer_resize)
-        {
-            GraphicRenderer::SetViewportSize(m_viewport_size.x, m_viewport_size.y);
-            m_refresh_texture_handle = true;
-
-            Messengers::IMessenger::SendAsync<Windows::Layers::Layer, Messengers::GenericMessage<std::pair<float, float>>>(
-                EDITOR_RENDER_LAYER_SCENE_REQUEST_RESIZE, Messengers::GenericMessage<std::pair<float, float>>{{m_viewport_size.x, m_viewport_size.y}});
-
-            m_request_renderer_resize = false;
-        }
-
         if (m_is_window_hovered && m_is_window_focused)
         {
             Messengers::IMessenger::SendAsync<Windows::Layers::Layer, Messengers::GenericMessage<bool>>(
@@ -70,8 +59,20 @@ namespace Tetragrama::Components
         }
     }
 
-    void SceneViewportUIComponent::Render()
+    void SceneViewportUIComponent::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
+        if (m_request_renderer_resize)
+        {
+            renderer->EnqueuedResizeRequests.Emplace({.Width = (uint32_t) m_viewport_size.x, .Height = (uint32_t) m_viewport_size.y});
+            m_refresh_texture_handle = true;
+
+            Messengers::IMessenger::SendAsync<Windows::Layers::Layer, Messengers::GenericMessage<std::pair<float, float>>>(
+                EDITOR_RENDER_LAYER_SCENE_REQUEST_RESIZE, Messengers::GenericMessage<std::pair<float, float>>{{m_viewport_size.x, m_viewport_size.y}});
+
+            m_request_renderer_resize = false;
+            return;
+        }
+
         ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
         ImGui::Begin(m_name.c_str(), (m_can_be_closed ? &m_can_be_closed : NULL), ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove);
 
@@ -85,7 +86,7 @@ namespace Tetragrama::Components
         // Scene texture representation
         if (!m_scene_texture || m_refresh_texture_handle)
         {
-            m_scene_texture          = GraphicRenderer::GetImguiFrameOutput();
+            m_scene_texture          = renderer->GetImguiFrameOutput();
             m_refresh_texture_handle = false;
         }
 

Tetragrama/Components/SceneViewportUIComponent.h

@@ -16,7 +16,7 @@ namespace Tetragrama::Components
         virtual ~SceneViewportUIComponent();
 
         void         Update(ZEngine::Core::TimeStep dt) override;
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
     public:
         std::future<void> SceneViewportClickedMessageHandlerAsync(Messengers::ArrayValueMessage<int, 2>&);

Tetragrama/EditorWindow.cpp

@@ -4,7 +4,6 @@
 #include <ZEngine/Engine.h>
 #include <ZEngine/Event/EngineClosedEvent.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
-#include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
 #include <ZEngine/Windows/Inputs/KeyCode.h>
 
 #ifdef _WIN32
@@ -139,8 +138,6 @@ namespace Tetragrama
 
     void EditorWindow::Initialize()
     {
-        GraphicRenderer::Initialize(this);
-
         for (const auto& layer : m_configuration.RenderingLayerCollection)
         {
             PushLayer(layer);
@@ -193,7 +190,6 @@ namespace Tetragrama
         {
             (*rlayer_it)->Deinitialize();
         }
-        GraphicRenderer::Deinitialize();
     }
 
     void EditorWindow::PollEvent()
@@ -369,24 +365,18 @@ namespace Tetragrama
 
     void EditorWindow::Update(Core::TimeStep delta_time)
     {
-        GraphicRenderer::Update();
-
         for (const Ref<Layers::Layer>& layer : *m_layer_stack_ptr)
         {
             layer->Update(delta_time);
         }
     }
 
-    void EditorWindow::Render()
+    void EditorWindow::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
-        GraphicRenderer::NewFrame();
-
         for (const Ref<Layers::Layer>& layer : *m_layer_stack_ptr)
         {
-            layer->Render();
+            layer->Render(renderer, command_buffer);
         }
-
-        GraphicRenderer::Present();
     }
 
     std::future<std::string> EditorWindow::OpenFileDialogAsync(std::span<std::string_view> type_filters)
@@ -447,11 +437,6 @@ namespace Tetragrama
         return outputs;
     }
 
-    Ref<Rendering::Swapchain> EditorWindow::GetSwapchain() const
-    {
-        return GraphicRenderer::GetSwapchain();
-    }
-
     EditorWindow::~EditorWindow()
     {
         glfwSetErrorCallback(NULL);
@@ -477,11 +462,6 @@ namespace Tetragrama
 
     bool EditorWindow::OnWindowResized(WindowResizedEvent& event)
     {
-        if (event.GetWidth() > 0 && event.GetHeight() > 0)
-        {
-            GraphicRenderer::ResizeSwapchain();
-        }
-
         ZENGINE_CORE_INFO("Window has been resized")
 
         Core::EventDispatcher event_dispatcher(event);

Tetragrama/EditorWindow.h

@@ -1,7 +1,7 @@
 #pragma once
 #define GLFW_INCLUDE_VULKAN
 #include <GLFW/glfw3.h>
-#include <ZEngine/Rendering/Swapchain.h>
+#include <ZEngine/Helpers/IntrusivePtr.h>
 #include <ZEngine/Windows/CoreWindow.h>
 #include <ZEngine/Windows/WindowConfiguration.h>
 #include <ZEngine/ZEngineDef.h>
@@ -32,13 +32,12 @@ namespace Tetragrama
         virtual float GetTime() override;
         virtual float GetDeltaTime() override;
         virtual void  Update(ZEngine::Core::TimeStep delta_time) override;
-        virtual void  Render() override;
+        virtual void  Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         virtual std::future<std::string> OpenFileDialogAsync(std::span<std::string_view> type_filters = {}) override;
 
-        virtual bool                                         CreateSurface(void* instance, void** out_window_surface) override;
-        virtual std::vector<std::string>                     GetRequiredExtensionLayers() override;
-        ZEngine::Helpers::Ref<ZEngine::Rendering::Swapchain> GetSwapchain() const override;
+        virtual bool                     CreateSurface(void* instance, void** out_window_surface) override;
+        virtual std::vector<std::string> GetRequiredExtensionLayers() override;
 
     public:
         bool OnEvent(ZEngine::Core::CoreEvent& event) override;
@@ -75,7 +74,7 @@ namespace Tetragrama
         static void __OnGlfwFrameBufferSizeChanged(GLFWwindow*, int width, int height);
 
     private:
-        GLFWwindow* m_native_window{nullptr};
+        GLFWwindow* m_native_window = nullptr;
     };
 
 } // namespace Tetragrama

Tetragrama/Layers/ImguiLayer.cpp

@@ -1,6 +1,7 @@
 #include <pch.h>
 #include <ImguiLayer.h>
 #include <Rendering/Renderers/GraphicRenderer.h>
+#include <Rendering/Renderers/ImGUIRenderer.h>
 #include <fmt/format.h>
 #include <imgui.h>
 
@@ -181,26 +182,16 @@ namespace Tetragrama::Layers
         return false;
     }
 
-    void ImguiLayer::Render()
+    void ImguiLayer::Render(Rendering::Renderers::GraphicRenderer* const renderer, Rendering::Buffers::CommandBuffer* const command_buffer)
     {
-        if (auto window_ptr = m_window.lock())
+        renderer->ImguiRenderer->BeginFrame();
+        for (const auto& component : m_ui_components)
         {
-            if (window_ptr->IsMinimized())
-            {
-                return;
-            }
-
-            GraphicRenderer::BeginImguiFrame();
-
-            for (const auto& component : m_ui_components)
+            if (component->GetVisibility() == true)
             {
-                if (component->GetVisibility() == true)
-                {
-                    component->Render();
-                }
+                component->Render(renderer, command_buffer);
             }
-            GraphicRenderer::DrawUIFrame();
-            GraphicRenderer::EndImguiFrame();
         }
+        renderer->ImguiRenderer->EndFrame(command_buffer, renderer->Device->CurrentFrameIndex);
     }
 } // namespace Tetragrama::Layers

Tetragrama/Layers/ImguiLayer.h

@@ -30,7 +30,7 @@ namespace Tetragrama::Layers
 
         void Update(ZEngine::Core::TimeStep dt) override;
 
-        void Render() override;
+        void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         virtual void AddUIComponent(const ZEngine::Helpers::Ref<Components::UIComponent>& component);
         virtual void AddUIComponent(ZEngine::Helpers::Ref<Components::UIComponent>&& component);

Tetragrama/Layers/RenderLayer.cpp

@@ -46,10 +46,10 @@ namespace Tetragrama::Layers
         return false;
     }
 
-    void RenderLayer::Render()
+    void RenderLayer::Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer)
     {
         auto camera = m_editor_camera_controller->GetCamera();
-        GraphicRenderer::DrawScene(camera, GraphicScene::GetRawData());
+        renderer->DrawScene(command_buffer, camera, GraphicScene::GetRawData());
     }
 
     std::future<void> RenderLayer::SceneRequestResizeMessageHandlerAsync(Messengers::GenericMessage<std::pair<float, float>>& message)

Tetragrama/Layers/RenderLayer.h

@@ -23,7 +23,7 @@ namespace Tetragrama::Layers
         virtual void Deinitialize() override;
         virtual void Update(ZEngine::Core::TimeStep dt) override;
 
-        virtual void Render() override;
+        virtual void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Rendering::Buffers::CommandBuffer* const command_buffer) override;
 
         virtual bool OnEvent(ZEngine::Core::CoreEvent& e) override;
 

ZEngine/ZEngine/Core/IRenderable.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <Rendering/Buffers/CommandBuffer.h>
+#include <Rendering/Renderers/GraphicRenderer.h>
 
 namespace ZEngine::Core
 {
@@ -8,6 +10,6 @@ namespace ZEngine::Core
         IRenderable()          = default;
         virtual ~IRenderable() = default;
 
-        virtual void Render() = 0;
+        virtual void Render(Rendering::Renderers::GraphicRenderer* const renderer = nullptr, Rendering::Buffers::CommandBuffer* const command_buffer = nullptr) = 0;
     };
 } // namespace ZEngine::Core