fix imgui sync

TheNumbat · Jan 28, 2024 · b830bc7 · b830bc7
1 parent 15dccf5
commit b830bc7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/deps/rpp b/deps/rpp
diff --git a/rvk/device.cpp b/rvk/device.cpp
@@ -765,12 +765,13 @@ Slice<const char*> Device::baseline_extensions() {
 }
 
 Slice<const char*> Device::ray_tracing_extensions() {
-    static Array<const char*, 5> device{
+    static Array<const char*, 6> device{
         reinterpret_cast<const char*>(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME),
         reinterpret_cast<const char*>(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME),
         reinterpret_cast<const char*>(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME),
         reinterpret_cast<const char*>(VK_KHR_RAY_TRACING_MAINTENANCE_1_EXTENSION_NAME),
         reinterpret_cast<const char*>(VK_KHR_RAY_TRACING_POSITION_FETCH_EXTENSION_NAME),
+        reinterpret_cast<const char*>(VK_KHR_RAY_QUERY_EXTENSION_NAME),
     };
     return Slice<const char*>{device};
 }

diff --git a/rvk/rvk.cpp b/rvk/rvk.cpp
@@ -472,6 +472,7 @@ void shutdown() {
 }
 
 void reset_imgui() {
+    vkDeviceWaitIdle(*impl::singleton->device);
     impl::singleton->destroy_imgui();
     impl::singleton->create_imgui();
 }

diff --git a/rvk/shader_loader.cpp b/rvk/shader_loader.cpp
@@ -65,8 +65,10 @@ void Shader_Loader::try_reload() {
                 Opt<Vec<u8, Files::Alloc>> data;
                 do {
                     data = shader.second.read();
-                    shader.first = Shader{device.dup(), data->slice()};
-                    callbacks_to_run.insert(reloads.get(token), {});
+                    if(data.ok()) {
+                        shader.first = Shader{device.dup(), data->slice()};
+                        callbacks_to_run.insert(reloads.get(token), {});
+                    }
                 } while(!data.ok());
             }
         }
+0 −34		.github/workflows/linux-arm64.yml
+0 −24		.github/workflows/macos.yml
+4 −6		.github/workflows/ubuntu.yml
+1 −1		.github/workflows/windows.yml
+1 −9		CMakeLists.txt
+10 −16		README.md
+6 −8		rpp/CMakeLists.txt
+2 −10		rpp/async.h
+2 −9		rpp/base.h
+1 −6		rpp/impl/log.cpp
+2 −1		rpp/impl/profile.cpp
+55 −50		rpp/impl/simd.cpp
+0 −82		rpp/impl/vmath.cpp
+1 −1		rpp/net.h
+0 −96		rpp/pos/async_bsd.cpp
+0 −70		rpp/pos/asyncio_bsd.cpp
+4 −2		rpp/pos/asyncio_pos.cpp
+2 −2		rpp/pos/net_pos.cpp
+15 −74		rpp/pos/thread_pos.cpp
+0 −7		rpp/pos/unify.cpp
+1 −6		rpp/profile.h
+24 −8		rpp/simd.h
+2 −2		rpp/std/coroutine.h
+22 −26		rpp/thread0.h
+2 −2		rpp/vmath.h
+0 −2		test/net.cpp
+0 −111		test/simd.cpp
+0 −43		test/vmath.cpp