From 20c66fe2f9ac69dbfa2f3cfc2386aae4ba7adc60 Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 16 Nov 2021 11:19:10 +0100 Subject: [PATCH] lavfi/vulkan: fix issues the previous commit introduced One typo and one think-before-you-paste. --- libavfilter/vulkan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c index 3bb4eea7a1..48f02e4603 100644 --- a/libavfilter/vulkan.c +++ b/libavfilter/vulkan.c @@ -119,7 +119,7 @@ void ff_vk_qf_init(AVFilterContext *avctx, FFVkQueueFamilyCtx *qf, av_assert0(0); /* Should never happen */ } - if (qf->actual_queues) + if (!nb_queues) qf->nb_queues = qf->actual_queues; else qf->nb_queues = nb_queues; @@ -1258,10 +1258,10 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl, /* If a set has never been updated, update all queues' sets. */ if (!pl->desc_set_initialized[set_id]) { for (int i = 0; i < pl->qf->nb_queues; i++) { - set_id = set_id*pl->qf->nb_queues + i; + int idx = set_id*pl->qf->nb_queues + i; vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev, - pl->desc_set[set_id], - pl->desc_template[set_id], + pl->desc_set[idx], + pl->desc_template[idx], s); } pl->desc_set_initialized[set_id] = 1;