mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vulkan: fix uninitialized writeDescriptor

Browse source
This commit is contained in:
columbarius 2023-08-19 16:47:17 +02:00 • committed by Wim Taymans
parent 00c475e646
commit 8bbc1c1abf
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/vulkan/vulkan-compute-utils.c
View file

@ -127,6 +127,7 @@ static int updateDescriptors(struct vulkan_compute_state *s)
uint32_t i; uint32_t i;
VkDescriptorImageInfo descriptorImageInfo[s->n_streams]; VkDescriptorImageInfo descriptorImageInfo[s->n_streams];
VkWriteDescriptorSet writeDescriptorSet[s->n_streams]; VkWriteDescriptorSet writeDescriptorSet[s->n_streams];
uint32_t descriptorSetLen = 0;
for (i = 0; i < s->n_streams; i++) { for (i = 0; i < s->n_streams; i++) {
struct vulkan_stream *p = &s->streams[i]; struct vulkan_stream *p = &s->streams[i];
@ -139,12 +140,12 @@ static int updateDescriptors(struct vulkan_compute_state *s)
p->busy_buffer_id = p->current_buffer_id; p->busy_buffer_id = p->current_buffer_id;
p->pending_buffer_id = SPA_ID_INVALID; p->pending_buffer_id = SPA_ID_INVALID;
descriptorImageInfo[i] = (VkDescriptorImageInfo) { descriptorImageInfo[descriptorSetLen] = (VkDescriptorImageInfo) {
.sampler = s->sampler, .sampler = s->sampler,
.imageView = p->buffers[p->current_buffer_id].view, .imageView = p->buffers[p->current_buffer_id].view,
.imageLayout = VK_IMAGE_LAYOUT_GENERAL, .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
}; };
writeDescriptorSet[i] = (VkWriteDescriptorSet) { writeDescriptorSet[descriptorSetLen] = (VkWriteDescriptorSet) {
.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
.dstSet = s->descriptorSet, .dstSet = s->descriptorSet,
.dstBinding = i, .dstBinding = i,
@ -154,8 +155,9 @@ static int updateDescriptors(struct vulkan_compute_state *s)
VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
.pImageInfo = &descriptorImageInfo[i], .pImageInfo = &descriptorImageInfo[i],
}; };
descriptorSetLen++;
} }
vkUpdateDescriptorSets(s->base.device, s->n_streams, vkUpdateDescriptorSets(s->base.device, descriptorSetLen,
writeDescriptorSet, 0, NULL); writeDescriptorSet, 0, NULL);
return 0; return 0;