From 706f76b18db995414db3614ef34db5e27f081355 Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Wed, 1 Apr 2026 15:40:36 +0200 Subject: [PATCH] Prevent concurrent vulkan encode operations --- server/encoder/encoder_settings.cpp | 2 + server/encoder/video_encoder_vulkan.cpp | 49 +++++++++++++++++-------- server/encoder/video_encoder_vulkan.h | 1 + 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/server/encoder/encoder_settings.cpp b/server/encoder/encoder_settings.cpp index f2d7e329..d79b4aaa 100644 --- a/server/encoder/encoder_settings.cpp +++ b/server/encoder/encoder_settings.cpp @@ -183,6 +183,8 @@ class prober { if (*vk.encode_queue == VK_NULL_HANDLE) return false; + if (not std::get(vk.feat).timelineSemaphore) + return false; auto prop = vk.physical_device.getQueueFamilyProperties2>(); assert(vk.encode_queue_family_index < prop.size()); const auto flags = prop.at(vk.encode_queue_family_index).get().videoCodecOperations; diff --git a/server/encoder/video_encoder_vulkan.cpp b/server/encoder/video_encoder_vulkan.cpp index 6e57897f..c41b62cb 100644 --- a/server/encoder/video_encoder_vulkan.cpp +++ b/server/encoder/video_encoder_vulkan.cpp @@ -22,6 +22,7 @@ #include "util/u_logging.h" #include "utils/wivrn_vk_bundle.h" #include +#include #include namespace @@ -462,12 +463,20 @@ void wivrn::video_encoder_vulkan::init(const vk::VideoCapabilitiesKHR & video_ca } // fence, semaphore - for (auto & item: slot_data) + for (auto [i, item]: std::ranges::enumerate_view(slot_data)) { item.fence = vk.device.createFence({.flags = vk::FenceCreateFlagBits::eSignaled}); item.wait_sem = vk.device.createSemaphore({}); + item.sem = vk.device.createSemaphore(vk::StructureChain{ + vk::SemaphoreCreateInfo{}, + vk::SemaphoreTypeCreateInfo{ + .semaphoreType = vk::SemaphoreType::eTimeline, + }, + } + .get()); vk.name(item.fence, "vulkan encoder fence"); - vk.name(item.fence, "vulkan encoder semaphore"); + vk.name(item.wait_sem, "vulkan encoder wait semaphore"); + vk.name(item.sem, "vulkan encoder complete semaphore"); } // query pool @@ -523,9 +532,7 @@ void wivrn::video_encoder_vulkan::init(const vk::VideoCapabilitiesKHR & video_ca .commandBufferCount = num_slots}); for (size_t i = 0; i < num_slots; ++i) { - slot_data[i].sem = vk.device.createSemaphore({}); slot_data[i].transfer_cmd_buf = std::move(command_buffers[i]); - vk.name(slot_data[i].sem, "vulkan encoder transfer semaphore"); vk.name(slot_data[i].transfer_cmd_buf, "vulkan encoder transfer command buffer"); } } @@ -942,15 +949,24 @@ std::pair wivrn::video_encoder_vulkan::present_image(vk::Im void wivrn::video_encoder_vulkan::post_submit(uint8_t slot) { auto & slot_item = slot_data[slot]; + const auto & prev_slot = slot_data[(slot + num_slots - 1) % num_slots]; const bool need_transfer = *slot_item.transfer_cmd_buf and slot_item.host_buffer; // Issue encode command, and if necessary transfer command vk.device.resetFences(*slot_item.fence); - vk::SemaphoreSubmitInfo wait_sem_info{ - .semaphore = *slot_item.wait_sem, - .stageMask = vk::PipelineStageFlagBits2::eAllCommands, + std::array wait_sem_info{ + vk::SemaphoreSubmitInfo{ + .semaphore = *prev_slot.sem, + .value = prev_slot.sem_value, + .stageMask = vk::PipelineStageFlagBits2::eAllCommands, + }, + vk::SemaphoreSubmitInfo{ + .semaphore = *slot_item.wait_sem, + .stageMask = vk::PipelineStageFlagBits2::eAllCommands, + }, }; vk::SemaphoreSubmitInfo sem_info{ .semaphore = slot_item.sem, + .value = ++slot_item.sem_value, .stageMask = vk::PipelineStageFlagBits2::eAllCommands, }; vk::CommandBufferSubmitInfo cmd_info{ @@ -959,15 +975,16 @@ void wivrn::video_encoder_vulkan::post_submit(uint8_t slot) { std::unique_lock lock(vk.encode_queue_mutex); - vk.encode_queue.submit2(vk::SubmitInfo2{ - .waitSemaphoreInfoCount = 1, - .pWaitSemaphoreInfos = &wait_sem_info, - .commandBufferInfoCount = 1, - .pCommandBufferInfos = &cmd_info, - .signalSemaphoreInfoCount = need_transfer ? 1u : 0, - .pSignalSemaphoreInfos = &sem_info, - }, - need_transfer ? nullptr : *slot_item.fence); + vk.encode_queue.submit2( + vk::SubmitInfo2{ + .waitSemaphoreInfoCount = wait_sem_info.size(), + .pWaitSemaphoreInfos = wait_sem_info.data(), + .commandBufferInfoCount = 1, + .pCommandBufferInfos = &cmd_info, + .signalSemaphoreInfoCount = 1, + .pSignalSemaphoreInfos = &sem_info, + }, + need_transfer ? nullptr : *slot_item.fence); } if (need_transfer) { diff --git a/server/encoder/video_encoder_vulkan.h b/server/encoder/video_encoder_vulkan.h index 0710b49f..3b79b672 100644 --- a/server/encoder/video_encoder_vulkan.h +++ b/server/encoder/video_encoder_vulkan.h @@ -49,6 +49,7 @@ class video_encoder_vulkan : public video_encoder vk::raii::CommandBuffer transfer_cmd_buf = nullptr; vk::raii::Semaphore wait_sem = nullptr; vk::raii::Semaphore sem = nullptr; + uint64_t sem_value = 0; vk::raii::Fence fence = nullptr; vk::raii::ImageView view = nullptr; buffer_allocation output_buffer;