History

lavfi/vulkan: fix issues the previous commit introduced

One typo and one think-before-you-paste.

Lynne committed 5 years ago

Commit 20c66fe1 parent bd555521 file · +4 −4Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vulkan.c+4−4
@@ -119,7 +119,7 @@ void ff_vk_qf_init(AVFilterContext *avctx, FFVkQueueFamilyCtx *qf, · 118 unmodified lines
119119 av_assert0(0); /* Should never happen */
120120 }
121121
122− if (qf->actual_queues)
122+ if (!nb_queues)
123123 qf->nb_queues = qf->actual_queues;
124124 else
125125 qf->nb_queues = nb_queues;
@@ -1258,10 +1258,10 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl, · 1132 unmodified lines
12581258 /* If a set has never been updated, update all queues' sets. */
12591259 if (!pl->desc_set_initialized[set_id]) {
12601260 for (int i = 0; i < pl->qf->nb_queues; i++) {
1261− set_id = set_id*pl->qf->nb_queues + i;
1261+ int idx = set_id*pl->qf->nb_queues + i;
12621262 vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev,
1263− pl->desc_set[set_id],
1264− pl->desc_template[set_id],
1263+ pl->desc_set[idx],
1264+ pl->desc_template[idx],
12651265 s);
12661266 }
12671267 pl->desc_set_initialized[set_id] = 1;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t