fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 20:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Use the max descriptor alignemtn in GetDescriptorSetLayoutSupport

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-07-13 19:06:20 -05:00 • committed by Marge Bot
parent 354fe8fda0
commit 81bec8b63b
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nouveau/vulkan/nvk_descriptor_set_layout.c
View file

@ -257,6 +257,23 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice _device,
vk_find_struct_const(pCreateInfo->pNext,
MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT);
/* Figure out the maximum alignment up-front. Otherwise, we need to sort
* the list of descriptors by binding number in order to get the size
* accumulation right.
*/
uint32_t max_align = 0;
for (uint32_t i = 0; i < pCreateInfo->bindingCount; i++) {
const VkDescriptorSetLayoutBinding *binding = &pCreateInfo->pBindings[i];
const VkMutableDescriptorTypeListEXT *type_list =
nvk_descriptor_get_type_list(binding->descriptorType,
mutable_info, i);
uint32_t stride, align;
nvk_descriptor_stride_align_for_type(binding->descriptorType, type_list,
&stride, &align);
max_align = MAX2(max_align, align);
}
uint32_t buffer_size = 0;
uint8_t dynamic_buffer_count = 0;
for (uint32_t i = 0; i < pCreateInfo->bindingCount; i++) {
@ -285,8 +302,13 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice _device,
if (stride > 0) {
assert(stride <= UINT8_MAX);
assert(util_is_power_of_two_nonzero(align));
buffer_size = ALIGN_POT(buffer_size, align);
/* Since we're aligning to the maximum and since this is just a
* check for whether or not the max buffer size is big enough, we
* keep buffer_size aligned to max_align.
*/
buffer_size += stride * binding->descriptorCount;
buffer_size = ALIGN_POT(buffer_size, max_align);
}
}