From c0344cbfb0a11bf76860a660c3662cf469449e24 Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 25 May 2020 15:37:17 +0100 Subject: [PATCH] lavfi/vulkan: fix queue counts and set indices --- libavfilter/vulkan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c index c3badaee29a..0ac5711182e 100644 --- a/libavfilter/vulkan.c +++ b/libavfilter/vulkan.c @@ -1163,7 +1163,7 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, VulkanPipeline *pl, VulkanFilterContext *s = avctx->priv; vkUpdateDescriptorSetWithTemplate(s->hwctx->act_dev, - pl->desc_set[set_id * s->cur_queue_idx], + pl->desc_set[s->cur_queue_idx * pl->desc_layout_num + set_id], pl->desc_template[set_id], s); } @@ -1182,9 +1182,7 @@ int ff_vk_init_pipeline_layout(AVFilterContext *avctx, VulkanPipeline *pl) VkResult ret; VulkanFilterContext *s = avctx->priv; - int queues_count = 1; - - pl->descriptor_sets_num = pl->desc_layout_num * queues_count; + pl->descriptor_sets_num = pl->desc_layout_num * s->queue_count; { /* Init descriptor set pool */ VkDescriptorPoolCreateInfo pool_create_info = { -- 2.39.2