Skip to content

fix(linux/vulkan): remove deprecated FFmpeg Vulkan queue lock/unlock #5031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
Apr 19, 2026
+0 −16
Merged

fix(linux/vulkan): remove deprecated FFmpeg Vulkan queue lock/unlock #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmake/compile_definitions/linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ if(${SUNSHINE_ENABLE_VULKAN})
list(APPEND PLATFORM_TARGET_FILES
"${CMAKE_SOURCE_DIR}/src/platform/linux/vulkan_encode.h"
"${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
set(VULKAN_SHADER_DIR "${CMAKE_BINARY_DIR}/generated-src/shaders")
Expand Down
14 changes: 0 additions & 14 deletions src/platform/linux/vulkan_encode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,21 +770,7 @@ namespace vk {
submit.signalSemaphoreCount = sem_count;
submit.pSignalSemaphores = signal_sems.data();

#if !defined(FF_API_VULKAN_SYNC_QUEUES) || FF_API_VULKAN_SYNC_QUEUES
vk_dev.ctx->lock_queue(
(AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data,
vk_dev.compute_qf,
0
);
#endif
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(
(AVHWDeviceContext *) ((AVHWFramesContext *) hw_frames_ctx->data)->device_ref->data,
vk_dev.compute_qf,
0
);
#endif

if (res != VK_SUCCESS) {
BOOST_LOG(error) << "vkQueueSubmit failed: " << res;
Expand Down
Loading