create pipe on first reload

TheNumbat · Mar 12, 2024 · f4ab6b4 · f4ab6b4
1 parent 39dc162
commit f4ab6b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/rvk/pipeline.cpp b/rvk/pipeline.cpp
@@ -116,14 +116,11 @@ Opt<Binding_Table> Binding_Table::make(Arc<Device, Alloc> device, Commands& cmds
 
 u64 Pipeline::shader_group_handles_size() {
     u64 handle_size = device->sbt_handle_size();
-    u64 handle_aligned = Math::align(handle_size, device->sbt_handle_alignment());
-    u64 total_size = n_shaders * handle_aligned;
-    return total_size;
+    return n_shaders * handle_size;
 }
 
-void Pipeline::shader_group_handles_write(Slice<u8> data) {
-    RVK_CHECK(vkGetRayTracingShaderGroupHandlesKHR(*device, pipeline, 0, n_shaders, data.length(),
-                                                   const_cast<u8*>(data.data())));
+void Pipeline::shader_group_handles_write(u8* data, u64 length) {
+    RVK_CHECK(vkGetRayTracingShaderGroupHandlesKHR(*device, pipeline, 0, n_shaders, length, data));
 }
 
 Pipeline::Pipeline(Arc<Device, Alloc> D, Info info) : device(move(D)) {

diff --git a/rvk/pipeline.h b/rvk/pipeline.h
@@ -144,7 +144,7 @@ struct Pipeline {
     template<Region R>
     Vec<u8, Mregion<R>> shader_group_handles() {
         auto data = Vec<u8, Mregion<R>>::make(shader_group_handles_size());
-        shader_group_handles_write(data.slice());
+        shader_group_handles_write(data.data(), data.length());
         return data;
     }
 
@@ -158,7 +158,7 @@ struct Pipeline {
     friend struct Vk;
 
     u64 shader_group_handles_size();
-    void shader_group_handles_write(Slice<u8> data);
+    void shader_group_handles_write(u8* data, u64 length);
 
     Arc<Device, Alloc> device;
 

diff --git a/rvk/shader_loader.cpp b/rvk/shader_loader.cpp
@@ -84,6 +84,8 @@ void Shader_Loader::on_reload(Slice<Shader_Loader::Token> tokens,
                               FunctionN<16, void(Shader_Loader&)> callback) {
     assert(device.ok());
 
+    callback(*this);
+
     Thread::Lock lock{mutex};
 
     Reload_Token reload_token = next_reload_token++;