From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 891A94A3E8 for ; Tue, 19 Aug 2025 14:18:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 0555868D528; Tue, 19 Aug 2025 17:18:54 +0300 (EEST) Received: from c1ad6a1ecdc3 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 16ED968D40A for ; Tue, 19 Aug 2025 17:18:52 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH=5D_hwcontext=5Fvulkan=3A_trans?= =?utf-8?q?fer_EXCLUSIVE_images_to_correct_queue_families_=28PR_=2320286?= =?utf-8?q?=29?= X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: vytskalt via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: vytskalt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20250819141854.0555868D528@ffbox0-bg.ffmpeg.org> Date: Tue, 19 Aug 2025 17:18:54 +0300 (EEST) Archived-At: List-Archive: List-Post: PR #20286 opened by vytskalt URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20286 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20286.patch Same as #20084 Turns out there were 2 more cases of this that I missed in the last PR >From 8e489937f98aaaf4ee24fe448799fe1ce1057b12 Mon Sep 17 00:00:00 2001 From: vytskalt Date: Tue, 19 Aug 2025 17:14:15 +0300 Subject: [PATCH] hwcontext_vulkan: transfer EXCLUSIVE images to correct queue families --- libavutil/hwcontext_vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".