ffmpeg | branch: master | Lynne <d...@lynne.ee> | Wed Feb 19 13:18:54 2025 +0000| [b6bf568a44ac5ae3b1db2e8f59facd7592a88f65] | committer: Lynne
vulkan: don't query video queue properties unless the extension is enabled Fixes validation errors. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6bf568a44ac5ae3b1db2e8f59facd7592a88f65 --- libavutil/hwcontext_vulkan.c | 4 ++-- libavutil/vulkan.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index f728163529..ec6459712b 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1418,7 +1418,7 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) }; qf[i] = (VkQueueFamilyProperties2) { .sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2, - .pNext = &qf_vid[i], + .pNext = p->vkctx.extensions & FF_VK_EXT_VIDEO_QUEUE ? &qf_vid[i] : NULL, }; } @@ -1798,7 +1798,7 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) }; qf[i] = (VkQueueFamilyProperties2) { .sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2, - .pNext = &qf_vid[i], + .pNext = p->vkctx.extensions & FF_VK_EXT_VIDEO_QUEUE ? &qf_vid[i] : NULL, }; } diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index a868a3b90d..c8ec53ea76 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -189,7 +189,7 @@ int ff_vk_load_props(FFVulkanContext *s) }; s->qf_props[i] = (VkQueueFamilyProperties2) { .sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2, - .pNext = &s->video_props[i], + .pNext = s->extensions & FF_VK_EXT_VIDEO_QUEUE ? &s->video_props[i] : NULL, }; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
