mirror of
https://github.com/LizardByte/Sunshine.git
synced 2026-05-06 21:50:57 +08:00
fix(linux/vulkan): remove deprecated FFmpeg Vulkan queue lock/unlock (#5031)
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user