One typo and one think-before-you-paste.
Unified · Split
| @@ -119,7 +119,7 @@ void ff_vk_qf_init(AVFilterContext *avctx, FFVkQueueFamilyCtx *qf, · 118 unmodified lines | |||
| 119 | av_assert0(0); /* Should never happen */ | 119 | av_assert0(0); /* Should never happen */ |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | if (qf->actual_queues) | 122 | if (!nb_queues) |
| 123 | qf->nb_queues = qf->actual_queues; | 123 | qf->nb_queues = qf->actual_queues; |
| 124 | else | 124 | else |
| 125 | qf->nb_queues = nb_queues; | 125 | qf->nb_queues = nb_queues; |
| @@ -1258,10 +1258,10 @@ void ff_vk_update_descriptor_set(AVFilterContext *avctx, FFVulkanPipeline *pl, · 1132 unmodified lines | |||
| 1258 | /* If a set has never been updated, update all queues' sets. */ | 1258 | /* If a set has never been updated, update all queues' sets. */ |
| 1259 | if (!pl->desc_set_initialized[set_id]) { | 1259 | if (!pl->desc_set_initialized[set_id]) { |
| 1260 | for (int i = 0; i < pl->qf->nb_queues; i++) { | 1260 | 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; |
| 1262 | vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev, | 1262 | vk->UpdateDescriptorSetWithTemplate(s->hwctx->act_dev, |
| 1263 | pl->desc_set[set_id], | 1263 | pl->desc_set[idx], |
| 1264 | pl->desc_template[set_id], | 1264 | pl->desc_template[idx], |
| 1265 | s); | 1265 | s); |
| 1266 | } | 1266 | } |
| 1267 | pl->desc_set_initialized[set_id] = 1; | 1267 | pl->desc_set_initialized[set_id] = 1; |