Saving PerfAnalyzer show/hide state; Creating renderers on demand

nadult · Oct 19, 2024 · 0c587e1 · 0c587e1
1 parent 9cfabca
commit 0c587e1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/libfwk b/libfwk
diff --git a/src/lucid_app.cpp b/src/lucid_app.cpp
@@ -35,6 +35,8 @@
 #include <fwk/vulkan/vulkan_swap_chain.h>
 #include <fwk/vulkan/vulkan_window.h>
 
+// TODO: device lost crash when resizing window with path tracer
+
 FilePath mainPath() {
 	return platform == Platform::msvc ? FilePath::current().get() : executablePath().parent();
 }
@@ -114,9 +116,15 @@ void LucidApp::setConfig(const AnyConfig &config) {
 	m_select_stats_tab = config.get("selected_stats_tab", -1);
 	if(auto *scene_name = config.get<string>("scene"))
 		selectSetup(*scene_name);
-	if(m_perf_analyzer)
+	if(config.get("show_perf_analyzer", true)) {
+		if(!m_perf_analyzer)
+			m_perf_analyzer.emplace();
 		if(auto *sub = config.subConfig("perf_analyzer"))
 			m_perf_analyzer->setConfig(*sub);
+	} else {
+		m_perf_analyzer.reset();
+	}
+
 	if(auto *sub = config.subConfig("gui"))
 		m_gui.setConfig(*sub);
 	if(auto *lighting = config.subConfig("lighting"))
@@ -150,7 +158,7 @@ void LucidApp::saveConfig() const {
 	out.set("window_maximized", is_maximized);
 	out.set("show_stats", m_show_stats);
 	out.set("selected_stats_tab", m_selected_stats_tab);
-
+	out.set("show_perf_analyzer", !!m_perf_analyzer);
 	if(m_setup_idx != -1)
 		out.set("scene", m_setups[m_setup_idx]->name);
 	if(m_perf_analyzer)
@@ -214,8 +222,7 @@ bool LucidApp::updateViewport() {
 Ex<void> LucidApp::updateRenderer() {
 	PERF_SCOPE();
 
-	bool do_update = !m_pbr_renderer || !m_simple_renderer || !m_lucid_renderer ||
-					 m_lucid_renderer->opts() != m_lucid_opts;
+	bool do_update = m_lucid_renderer && m_lucid_renderer->opts() != m_lucid_opts;
 	if(updateViewport())
 		do_update = true;
 
@@ -235,20 +242,11 @@ Ex<void> LucidApp::updateRenderer() {
 	}
 
 	if(do_update) {
-		auto swap_chain = m_device->swapChain();
 		m_lucid_renderer.reset();
 		m_simple_renderer.reset();
 		m_pbr_renderer.reset();
 		m_path_tracer.reset();
 		m_device->waitForIdle();
-
-		m_pbr_renderer = EX_PASS(
-			construct<PbrRenderer>(m_device, *m_shader_compiler, m_viewport, swap_chain->format()));
-		m_simple_renderer = EX_PASS(construct<SimpleRenderer>(m_device, *m_shader_compiler,
-															  m_viewport, swap_chain->format()));
-		m_lucid_renderer = EX_PASS(construct<LucidRenderer>(
-			*m_device, *m_shader_compiler, swap_chain->format(), m_lucid_opts, m_viewport.size()));
-
 		m_last_shader_update_time = m_last_time;
 		m_scene_frame_id = 0;
 	}
@@ -258,6 +256,20 @@ Ex<void> LucidApp::updateRenderer() {
 		m_rendering_mode = RenderingMode::simple;
 	}
 
+	auto swap_chain = m_device->swapChain();
+
+	if(m_rendering_mode == RenderingMode::pbr && !m_pbr_renderer)
+		m_pbr_renderer = EX_PASS(
+			construct<PbrRenderer>(m_device, *m_shader_compiler, m_viewport, swap_chain->format()));
+
+	if(isOneOf(m_rendering_mode, RenderingMode::simple, RenderingMode::mixed) && !m_simple_renderer)
+		m_simple_renderer = EX_PASS(construct<SimpleRenderer>(m_device, *m_shader_compiler,
+															  m_viewport, swap_chain->format()));
+
+	if(isOneOf(m_rendering_mode, RenderingMode::lucid, RenderingMode::mixed) && !m_lucid_renderer)
+		m_lucid_renderer = EX_PASS(construct<LucidRenderer>(
+			*m_device, *m_shader_compiler, swap_chain->format(), m_lucid_opts, m_viewport.size()));
+
 	if(m_rendering_mode == RenderingMode::path_trace && !m_path_tracer) {
 		auto format = m_device->swapChain()->format();
 		m_path_tracer = EX_PASS(construct<PathTracer>(*m_device, *m_shader_compiler, format,
+6 −1		src/gfx/shader_reflection.cpp
+2 −0		src/gui/gui.cpp
+1 −1		src/perf/thread_context.cpp
+1 −1		src/tests/vector_perf.cpp
+2 −2		src/tests/window.cpp
+2 −2		src/tools/model_viewer.cpp
+3 −1		src/vulkan/vulkan_buffer.cpp
+5 −3		src/vulkan/vulkan_command_queue.cpp
+3 −1		src/vulkan/vulkan_descriptor_manager.cpp
+2 −0		src/vulkan/vulkan_device.cpp
+3 −1		src/vulkan/vulkan_framebuffer.cpp
+3 −1		src/vulkan/vulkan_image.cpp
+2 −0		src/vulkan/vulkan_instance.cpp
+3 −1		src/vulkan/vulkan_internal.cpp
+4 −2		src/vulkan/vulkan_memory_manager.cpp
+3 −1		src/vulkan/vulkan_pipeline.cpp
+3 −1		src/vulkan/vulkan_ray_tracing.cpp
+3 −1		src/vulkan/vulkan_shader.cpp
+4 −2		src/vulkan/vulkan_swap_chain.cpp
+2 −0		src/vulkan/vulkan_window.cpp
+1 −0		todo.txt