lavfi/vulkan: fix queue counts and set indices

5 years ago · c0344cbfb0
parent fb49d5c0b1
commit c0344cbfb0
1 changed files with 2 additions and 4 deletions
--- 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 = {