[WIP] Work in progress

inexorgame · Jul 23, 2024 · 2611084 · 2611084
1 parent c9cc646
commit 2611084
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/include/inexor/vulkan-renderer/renderers/imgui.hpp b/include/inexor/vulkan-renderer/renderers/imgui.hpp
@@ -65,6 +65,8 @@ class ImGuiRenderer {
     std::vector<std::uint32_t> m_index_data;
     std::vector<ImDrawVert> m_vertex_data;
 
+    ImGuiContext *m_imgui_context{nullptr};
+
     unsigned char *m_font_texture_data{nullptr};
     int m_font_texture_width{0};
     int m_font_texture_height{0};

diff --git a/src/vulkan-renderer/application.cpp b/src/vulkan-renderer/application.cpp
@@ -331,7 +331,6 @@ void Application::mouse_button_callback(GLFWwindow * /*window*/, int button, int
     if (button < 0 || button > GLFW_MOUSE_BUTTON_LAST) {
         return;
     }
-
     switch (action) {
     case GLFW_PRESS:
         m_input_data->press_mouse_button(button);
@@ -375,11 +374,7 @@ void Application::recreate_swapchain() {
     glfwGetFramebufferSize(m_window->get(), &wnd_width, &wnd_height);
 
     m_swapchain->setup(wnd_width, wnd_height, m_vsync_enabled);
-
-    // TODO: Unified API style like this: m_device->create_rendergraph(m_swapchain);
-    // TODO: Maybe make RenderGraph constructor (and others) private and only allow device wrapper to call it?
     m_render_graph = std::make_unique<render_graph::RenderGraph>(*m_device);
-
     setup_render_graph();
 }
 

diff --git a/src/vulkan-renderer/renderers/imgui.cpp b/src/vulkan-renderer/renderers/imgui.cpp
@@ -31,7 +31,8 @@ ImGuiRenderer::ImGuiRenderer(const Device &device,
     // NOTE: It's valid for previous_pass to be an invalid pointer (in that case there is no previous pass!)
 
     spdlog::trace("Creating ImGui context");
-    ImGui::CreateContext();
+    m_imgui_context = ImGui::CreateContext();
+    ImGui::SetCurrentContext(m_imgui_context);
 
     spdlog::trace("Loading ImGui font texture");
     load_font_data_from_file();
@@ -192,7 +193,8 @@ ImGuiRenderer::ImGuiRenderer(ImGuiRenderer &&other) noexcept {
 }
 
 ImGuiRenderer::~ImGuiRenderer() {
-    ImGui::DestroyContext();
+    ImGui::DestroyContext(m_imgui_context);
+    m_imgui_context = nullptr;
 }
 
 void ImGuiRenderer::load_font_data_from_file() {