[FFmpeg-devel] hwcontext_vulkan: transfer exclusive images to correct queue family in drm->vulkan mapping

[FFmpeg-devel] hwcontext_vulkan: transfer exclusive images to correct queue family in drm->vulkan mapping

[vytskalt via ffmpeg-devel]

From: vytskalt <vytskalt@protonmail.com>

VK_QUEUE_FAMILY_IGNORED is only valid when the image is in CONCURRENT
sharing mode. When there is only one queue family it's in the EXCLUSIVE
sharing mode and the dst queue family must match it.

Fixes validation error during drm->vulkan frame mapping:
"pDependencyInfo->pImageMemoryBarriers[0] has srcQueueFamilyIndex
4294967294 (VK_QUEUE_FAMILY_EXTERNAL) and dstQueueFamilyIndex 4294967295
(VK_QUEUE_FAMILY_IGNORED). The command buffer's command pool is
associated with family index 0. Source or destination queue family must
match queue family associated with the command buffer's command pool."

Signed-off-by: vytskalt <vytskalt@protonmail.com>
---
 libavutil/hwcontext_vulkan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 894bc3dae1..6d7df3e619 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -3417,7 +3417,7 @@ static int vulkan_map_from_drm_frame_sync(AVHWFramesContext *hwfc, AVFrame *dst,
                             ((flags & AV_HWFRAME_MAP_WRITE) ?
                              VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT : 0x0),
                             VK_IMAGE_LAYOUT_GENERAL,
-                            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.0


_______________________________________________
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".