nvk: use vk_descriptor_type_is_dynamic

No need to open-code this one now that we have a generic helper.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32627>
This commit is contained in:
Erik Faye-Lund 2024-12-13 13:09:15 +01:00 committed by Marge Bot
parent dc5ac13959
commit 4bcb92d35b
2 changed files with 2 additions and 14 deletions

View file

@ -424,9 +424,7 @@ nvk_UpdateDescriptorSets(VkDevice device,
}
}
switch (src_binding_layout->type) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: {
if (vk_descriptor_type_is_dynamic(src_binding_layout->type)) {
const uint32_t dst_dyn_start =
dst_binding_layout->dynamic_buffer_index + copy->dstArrayElement;
const uint32_t src_dyn_start =
@ -434,10 +432,6 @@ nvk_UpdateDescriptorSets(VkDevice device,
typed_memcpy(&dst->dynamic_buffers[dst_dyn_start],
&src->dynamic_buffers[src_dyn_start],
copy->descriptorCount);
break;
}
default:
break;
}
}
}

View file

@ -425,14 +425,8 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice device,
if (binding_flags != NULL && binding_flags->bindingCount > 0)
flags = binding_flags->pBindingFlags[i];
switch (binding->descriptorType) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
if (vk_descriptor_type_is_dynamic(binding->descriptorType))
dynamic_buffer_count += binding->descriptorCount;
break;
default:
break;
}
const VkMutableDescriptorTypeListEXT *type_list =
nvk_descriptor_get_type_list(binding->descriptorType,