ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavfi/vulkan: fix static descriptor set updating

Browse Source 
Update all descriptor sets for all queues if a descriptor set hasn't
been initialized yet.
This commit is contained in:
Lynne 2021-11-16 10:22:03 +01:00
parent 5fc935c7fa
commit 8f9888a8d4
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/vulkan.c
View File

@ -1105,6 +1105,13 @@ int ff_vk_add_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl,
if (!pl->desc_layout)
return AVERROR(ENOMEM);
pl->desc_set_initialized = av_realloc_array(pl->desc_set_initialized,
sizeof(*pl->desc_set_initialized),
pl->descriptor_sets_num + 1);
if (!pl->desc_set_initialized)
return AVERROR(ENOMEM);
pl->desc_set_initialized[pl->descriptor_sets_num] = 0;
layout = &pl->desc_layout[pl->desc_layout_num];
{ /* Create descriptor set layout descriptions */
@ -1245,6 +1252,19 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl,
FFVulkanContext *s = avctx->priv;
FFVulkanFunctions *vk = &s->vkfn;
/* 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;
vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev,
pl->desc_set[set_id],
pl->desc_template[set_id],
s);
}
pl->desc_set_initialized[set_id] = 1;
return;
}
set_id = set_id*pl->qf->nb_queues + pl->qf->cur_queue;
vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev,
@ -1514,6 +1534,7 @@ static void free_pipeline(FFVulkanContext *s, FFVulkanPipeline *pl)
av_freep(&pl->shaders);
av_freep(&pl->desc_layout);
av_freep(&pl->desc_template);
av_freep(&pl->desc_set_initialized);
av_freep(&pl->push_consts);
pl->push_consts_num = 0;

1
libavfilter/vulkan.h
View File

@ -113,6 +113,7 @@ typedef struct FFVulkanPipeline {
void **desc_staging;
VkDescriptorSetLayoutBinding **desc_binding;
VkDescriptorUpdateTemplate *desc_template;
int *desc_set_initialized;
int desc_layout_num;
int descriptor_sets_num;
int total_descriptor_sets;