AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Reference descriptor set layouts in the sets themselves

Browse Source 
We need descriptor set layouts for vkUpdateDescriptorSets() but they
have different lifetimes.  This is the entire reason for doing reference
counting at all but we haven't actually set up the descriptor set code
to take references yet.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-01-30 20:11:59 -06:00
committed by Marge Bot
parent 687900de4b
commit e523c04006
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_descriptor_set.c
+4 -1
View File
@@ -307,6 +307,8 @@ nvk_descriptor_set_destroy(struct nvk_device *device,
}
}
nvk_descriptor_set_layout_unref(device, set->layout);
vk_object_free(&device->vk, NULL, set);
}
@@ -429,7 +431,6 @@ nvk_descriptor_set_create(struct nvk_device *device,
if (!set)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
set->layout = layout;
if (pool->entry_count == pool->max_entry_count)
return VK_ERROR_OUT_OF_POOL_MEMORY;
@@ -449,6 +450,8 @@ nvk_descriptor_set_create(struct nvk_device *device,
NVK_MIN_UBO_ALIGNMENT);
pool->entry_count++;
set->layout = nvk_descriptor_set_layout_ref(layout);
for (uint32_t b = 0; b < layout->binding_count; b++) {
if (layout->binding[b].type != VK_DESCRIPTOR_TYPE_SAMPLER &&
layout->binding[b].type != VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)