T-Gander/Sunshine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(linux/vulkan): guard deprecated FFmpeg Vulkan queue lock/unlock (#5005)

Browse Source
This commit is contained in:
neatnoise
2026-04-17 03:17:15 +02:00
committed by GitHub
parent 3527320311
commit a40f27f34e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/compile_definitions/linux.cmake
View File

@@ -148,6 +148,8 @@ if(${SUNSHINE_ENABLE_VULKAN})
list(APPEND PLATFORM_TARGET_FILES list(APPEND PLATFORM_TARGET_FILES
"${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.h" "${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.h"
"${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.cpp") "${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.cpp")
set_source_files_properties("${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.cpp"
PROPERTIES COMPILE_OPTIONS "-Wno-deprecated-declarations")
# compile GLSL -> SPIR-V -> C include at build time # compile GLSL -> SPIR-V -> C include at build time
set(VULKAN_SHADER_DIR "${CMAKE_BINARY_DIR}/generated-src/shaders") set(VULKAN_SHADER_DIR "${CMAKE_BINARY_DIR}/generated-src/shaders")

5
src/platform/linux/vulkan_encode.cpp
View File

@@ -770,18 +770,21 @@ namespace vk {
submit.signalSemaphoreCount = sem_count; submit.signalSemaphoreCount = sem_count;
submit.pSignalSemaphores = signal_sems.data(); submit.pSignalSemaphores = signal_sems.data();
// Lock the queue (FFmpeg requires this) #if !defined(FF_API_VULKAN_SYNC_QUEUES) || FF_API_VULKAN_SYNC_QUEUES
vk_dev.ctx->lock_queue( vk_dev.ctx->lock_queue(
(AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data, (AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data,
vk_dev.compute_qf, vk_dev.compute_qf,
0 0
); );
#endif
auto res = vkQueueSubmit(vk_dev.compute_queue, 1, &submit, VK_NULL_HANDLE); auto res = vkQueueSubmit(vk_dev.compute_queue, 1, &submit, VK_NULL_HANDLE);
#if !defined(FF_API_VULKAN_SYNC_QUEUES) || FF_API_VULKAN_SYNC_QUEUES
vk_dev.ctx->unlock_queue( vk_dev.ctx->unlock_queue(
(AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data, (AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data,
vk_dev.compute_qf, vk_dev.compute_qf,
0 0
); );
#endif
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
BOOST_LOG(error) << "vkQueueSubmit failed: " << res; BOOST_LOG(error) << "vkQueueSubmit failed: " << res;