[FFmpeg-cvslog] lavfi/vulkan: fix queue counts and set indices

[Lynne]

ffmpeg | branch: master | Lynne <dev at lynne.ee> | Mon May 25 15:37:17 2020 +0100| [c0344cbfb0a11bf76860a660c3662cf469449e24] | committer: Lynne

lavfi/vulkan: fix queue counts and set indices

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0344cbfb0a11bf76860a660c3662cf469449e24
---

 libavfilter/vulkan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c
index c3badaee29..0ac5711182 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 = {