[FFmpeg-cvslog] [ffmpeg] branch master updated. a6b5a382dd hwcontext_vulkan: transfer EXCLUSIVE images to correct queue families
ffmpeg-git at ffmpeg.org
ffmpeg-git at ffmpeg.org
Tue Aug 19 17:34:53 EEST 2025
The branch, master has been updated
via a6b5a382dd7ecdd27c5d0ebba688e1db409d18fd (commit)
from c05fc27dd33b361eb0105157ab7d3a01c2ffa782 (commit)
- Log -----------------------------------------------------------------
commit a6b5a382dd7ecdd27c5d0ebba688e1db409d18fd
Author: vytskalt <vytskalt at protonmail.com>
AuthorDate: Tue Aug 19 17:14:15 2025 +0300
Commit: Lynne <dev at lynne.ee>
CommitDate: Tue Aug 19 14:34:17 2025 +0000
hwcontext_vulkan: transfer EXCLUSIVE images to correct queue families
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index e066fa8d18..2e04e63212 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -2464,7 +2464,7 @@ static int prepare_frame(AVHWFramesContext *hwfc, FFVkExecPool *ectx,
VkImageMemoryBarrier2 img_bar[AV_NUM_DATA_POINTERS];
int nb_img_bar = 0;
- uint32_t dst_qf = VK_QUEUE_FAMILY_IGNORED;
+ uint32_t dst_qf = p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0];
VkImageLayout new_layout;
VkAccessFlags2 new_access;
VkPipelineStageFlagBits2 src_stage = VK_PIPELINE_STAGE_2_NONE;
@@ -4546,7 +4546,7 @@ static int vulkan_transfer_frame(AVHWFramesContext *hwfc,
VK_ACCESS_TRANSFER_READ_BIT,
upload ? VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL :
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
- VK_QUEUE_FAMILY_IGNORED);
+ p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0]);
vk->CmdPipelineBarrier2(cmd_buf, &(VkDependencyInfo) {
.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO,
-----------------------------------------------------------------------
Summary of changes:
libavutil/hwcontext_vulkan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
More information about the ffmpeg-cvslog
mailing list