lock imgui submit

Author: TheNumbat

deps/rpp

@@ -606,6 +606,19 @@ u32 Device::queue_index(Queue_Family family) {
     }
 }
 
+void Device::lock_queues() {
+    mutex.lock();
+}
+
+void Device::unlock_queues() {
+    mutex.unlock();
+}
+
+VkResult Device::present(const VkPresentInfoKHR& info) {
+    Thread::Lock lock(mutex);
+    return vkQueuePresentKHR(present_q, &info);
+}
+
 void Device::submit(Commands& cmds, u32 index) {
 
     VkCommandBufferSubmitInfo cmd_info = {};

rvk/device.cpp

@@ -93,6 +93,7 @@ struct Device {
     Device& operator=(Device&&) = delete;
 
     void imgui();
+    VkResult present(const VkPresentInfoKHR& info);
 
     u32 heap_index(Heap heap);
     u64 heap_size(Heap heap);
@@ -103,7 +104,6 @@ struct Device {
 
     u32 queue_index(Queue_Family family);
     u64 queue_count(Queue_Family family);
-    VkQueue queue(Queue_Family family, u32 index = 0);
 
     void submit(Commands& cmds, u32 index);
     void submit(Commands& cmds, u32 index, Fence& fence);
@@ -122,6 +122,13 @@ struct Device {
     explicit Device(Arc<Physical_Device, Alloc> physical_device, VkSurfaceKHR surface,
                     bool ray_tracing);
     friend struct Arc<Device, Alloc>;
+    friend struct Vk;
+    friend struct Compositor;
+
+    // TODO(max): lock per queue
+    void lock_queues();
+    void unlock_queues();
+    VkQueue queue(Queue_Family family, u32 index = 0);
 
     Arc<Physical_Device, Alloc> physical_device;
     Vec<String<Alloc>, Alloc> enabled_extensions;

rvk/device.h

@@ -198,7 +198,7 @@ Vk::Vk(Config config) {
                                                 instance->surface(), config.frames_in_flight);
     });
 
-    compositor = Arc<Compositor, Alloc>::make(device, descriptor_pool, swapchain.dup());
+    compositor = Arc<Compositor, Alloc>::make(device.dup(), swapchain.dup(), descriptor_pool);
 
     create_imgui();
 }
@@ -383,7 +383,7 @@ void Vk::end_frame(Image_View& output) {
     present_info.pImageIndices = &state.swapchain_index;
 
     // Submit presentation command
-    VkResult result = vkQueuePresentKHR(device->queue(Queue_Family::present), &present_info);
+    VkResult result = device->present(present_info);
     if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) {
         recreate_swapchain();
     } else if(result != VK_SUCCESS) {
@@ -414,7 +414,7 @@ void Vk::recreate_swapchain() {
             swapchain = Arc<Swapchain, Alloc>::make(cmds, physical_device, device.dup(),
                                                     instance->surface(), state.frames_in_flight);
         });
-        compositor = Arc<Compositor, Alloc>::make(device, descriptor_pool, swapchain.dup());
+        compositor = Arc<Compositor, Alloc>::make(device.dup(), swapchain.dup(), descriptor_pool);
 
         create_imgui();
 

rvk/rvk.cpp

@@ -190,10 +190,10 @@ VkExtent2D Swapchain::choose_extent(VkSurfaceCapabilitiesKHR capabilities) {
     return ext;
 }
 
-Compositor::Compositor(Arc<Device, Alloc>& device, Arc<Descriptor_Pool, Alloc>& pool,
-                       Arc<Swapchain, Alloc> S)
-    : swapchain(move(S)), v(compositor_v(device.dup())), f(compositor_f(device.dup())),
-      ds_layout(device.dup(), compositor_ds_layout()),
+Compositor::Compositor(Arc<Device, Alloc> D, Arc<Swapchain, Alloc> S,
+                       Arc<Descriptor_Pool, Alloc>& pool)
+    : swapchain(move(S)), device(move(D)), v(compositor_v(device.dup())),
+      f(compositor_f(device.dup())), ds_layout(device.dup(), compositor_ds_layout()),
       ds(pool->make(ds_layout, swapchain->frame_count())),
       sampler(device.dup(), VK_FILTER_NEAREST, VK_FILTER_NEAREST),
       pipeline(Pipeline{device.dup(), compositor_pipeline_info(swapchain, ds_layout, v, f)}) {
@@ -243,7 +243,11 @@ void Compositor::render(Commands& cmds, u64 frame_index, u64 slot_index, bool ha
     vkCmdDraw(cmds, 4, 1, 0, 0);
     if(has_imgui) {
         ImGui::Render();
-        if(auto draw = ImGui::GetDrawData()) ImGui_ImplVulkan_RenderDrawData(draw, cmds);
+        if(auto draw = ImGui::GetDrawData()) {
+            device->lock_queues();
+            ImGui_ImplVulkan_RenderDrawData(draw, cmds);
+            device->unlock_queues();
+        }
     }
     vkCmdEndRendering(cmds);
 }

rvk/swapchain.cpp

@@ -16,8 +16,8 @@ using namespace rpp;
 
 struct Compositor {
 
-    explicit Compositor(Arc<Device, Alloc>& device, Arc<Descriptor_Pool, Alloc>& pool,
-                        Arc<Swapchain, Alloc> swapchain);
+    explicit Compositor(Arc<Device, Alloc> device, Arc<Swapchain, Alloc> swapchain,
+                        Arc<Descriptor_Pool, Alloc>& pool);
     ~Compositor();
 
     Compositor(const Compositor&) = delete;
@@ -28,6 +28,7 @@ struct Compositor {
     void render(Commands& cmds, u64 frame_index, u64 slot_index, bool has_imgui, Image_View& input);
 
 private:
+    Arc<Device, Alloc> device;
     Arc<Swapchain, Alloc> swapchain;
 
     Shader v, f;