merian-nodes: Add convenience ShaderCompiler to GraphRun

LDAP · Feb 3, 2025 · 9667192 · 9667192
1 parent 5b701ce
commit 9667192
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/include/merian-nodes/graph/graph.hpp b/include/merian-nodes/graph/graph.hpp
@@ -214,12 +214,14 @@ class Graph : public std::enable_shared_from_this<Graph<ITERATIONS_IN_FLIGHT>> {
           registry(context, resource_allocator), ring_fences(context),
           thread_pool(std::make_shared<ThreadPool>()),
           cpu_queue(std::make_shared<CPUQueue>(context, thread_pool)),
-          run_profiler(std::make_shared<merian::Profiler>(context)), graph_run(ITERATIONS_IN_FLIGHT,
-                                                                               thread_pool,
-                                                                               cpu_queue,
-                                                                               run_profiler,
-                                                                               resource_allocator,
-                                                                               queue) {
+          run_profiler(std::make_shared<merian::Profiler>(context)),
+          graph_run(ITERATIONS_IN_FLIGHT,
+                    thread_pool,
+                    cpu_queue,
+                    run_profiler,
+                    resource_allocator,
+                    queue,
+                    ShaderCompiler::get(context)) {
 
         for (uint32_t i = 0; i < ITERATIONS_IN_FLIGHT; i++) {
             InFlightData& in_flight_data = ring_fences.get(i).user_data;

diff --git a/include/merian-nodes/graph/graph_run.hpp b/include/merian-nodes/graph/graph_run.hpp
@@ -5,6 +5,7 @@
 #include "merian/vk/command/caching_command_pool.hpp"
 #include "merian/vk/command/command_buffer.hpp"
 #include "merian/vk/memory/resource_allocator.hpp"
+#include "merian/vk/shader/shader_compiler.hpp"
 #include "merian/vk/sync/semaphore_binary.hpp"
 #include "merian/vk/sync/semaphore_timeline.hpp"
 #include "merian/vk/utils/cpu_queue.hpp"
@@ -27,9 +28,17 @@ class GraphRun {
              const CPUQueueHandle& cpu_queue,
              const ProfilerHandle& profiler,
              const ResourceAllocatorHandle& allocator,
-             const QueueHandle& queue)
+             const QueueHandle& queue,
+             const ShaderCompilerHandle& shader_compiler)
         : iterations_in_flight(iterations_in_flight), thread_pool(thread_pool),
-          cpu_queue(cpu_queue), profiler(profiler), allocator(allocator), queue(queue) {}
+          cpu_queue(cpu_queue), profiler(profiler), allocator(allocator), queue(queue),
+          shader_compiler(shader_compiler) {}
+
+    GraphRun(GraphRun& graph_run) = delete;
+    GraphRun(GraphRun&& graph_run) = delete;
+
+    GraphRun& operator=(GraphRun& graph_run) = delete;
+    GraphRun& operator=(GraphRun&& graph_run) = delete;
 
     // Enqueues a wait semaphore for the next submit. Note that during a graph run multiple submits
     // might happen.
@@ -156,6 +165,10 @@ class GraphRun {
         return cpu_queue;
     }
 
+    const ShaderCompilerHandle& get_shader_compiler() const {
+        return shader_compiler;
+    }
+
     // ------------------------------------------------------------------------------------
     // Interact with graph runtime
 
@@ -239,6 +252,7 @@ class GraphRun {
     const ProfilerHandle profiler;
     const ResourceAllocatorHandle allocator;
     const QueueHandle queue;
+    const ShaderCompilerHandle shader_compiler;
 
     std::shared_ptr<CachingCommandPool> cmd_cache = nullptr;
     CommandBufferHandle cmd = nullptr;