From dc5ac13959ccdbee7d34958db894996fe3b1f9f4 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 13 Dec 2024 13:09:15 +0100 Subject: [PATCH] dozen: use vk_descriptor_type_is_dynamic No need to open-code this one now that we have a generic helper. Reviewed-by: Alyssa Rosenzweig Reviewed-by: Lionel Landwerlin Part-of: --- src/microsoft/vulkan/dzn_descriptor_set.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c index 4318dc11d1b..3a6c8bc5a97 100644 --- a/src/microsoft/vulkan/dzn_descriptor_set.c +++ b/src/microsoft/vulkan/dzn_descriptor_set.c @@ -1767,14 +1767,8 @@ dzn_descriptor_pool_create(struct dzn_device *device, uint32_t num_desc = pCreateInfo->pPoolSizes[p].descriptorCount; if (device->bindless) { - switch (type) { - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: - case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: - break; - default: + if (!vk_descriptor_type_is_dynamic(type)) pool->desc_count[0] += num_desc; - break; - } } else { switch (type) { case VK_DESCRIPTOR_TYPE_SAMPLER: @@ -2274,8 +2268,7 @@ dzn_descriptor_set_copy(struct dzn_device *device, MIN2(dzn_descriptor_set_remaining_descs_in_binding(src_set->layout, &src_ptr), dzn_descriptor_set_remaining_descs_in_binding(dst_set->layout, &dst_ptr)); - if (src_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || - src_type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) { + if (vk_descriptor_type_is_dynamic(src_type)) { uint32_t src_idx = dzn_descriptor_set_ptr_get_buffer_idx(src_set->layout, &src_ptr); uint32_t dst_idx =