From 57dc5bb31fed3896dd3769fc0b3e317054e84d48 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 13 Dec 2024 13:09:15 +0100 Subject: [PATCH] asahi: 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/asahi/vulkan/hk_descriptor_set.c | 8 +------- src/asahi/vulkan/hk_descriptor_set_layout.c | 15 ++------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/asahi/vulkan/hk_descriptor_set.c b/src/asahi/vulkan/hk_descriptor_set.c index 7d87ec6f313..49df14f68d3 100644 --- a/src/asahi/vulkan/hk_descriptor_set.c +++ b/src/asahi/vulkan/hk_descriptor_set.c @@ -316,9 +316,7 @@ hk_UpdateDescriptorSets(VkDevice device, uint32_t descriptorWriteCount, } } - 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 = @@ -326,10 +324,6 @@ hk_UpdateDescriptorSets(VkDevice device, uint32_t descriptorWriteCount, typed_memcpy(&dst->dynamic_buffers[dst_dyn_start], &src->dynamic_buffers[src_dyn_start], copy->descriptorCount); - break; - } - default: - break; } } } diff --git a/src/asahi/vulkan/hk_descriptor_set_layout.c b/src/asahi/vulkan/hk_descriptor_set_layout.c index 7efe2e127a6..f2251361763 100644 --- a/src/asahi/vulkan/hk_descriptor_set_layout.c +++ b/src/asahi/vulkan/hk_descriptor_set_layout.c @@ -193,14 +193,9 @@ hk_CreateDescriptorSetLayout(VkDevice device, layout->binding[b].array_size = binding->descriptorCount; - 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)) { layout->binding[b].dynamic_buffer_index = dynamic_buffer_count; dynamic_buffer_count += binding->descriptorCount; - break; - default: - break; } const VkMutableDescriptorTypeListEXT *type_list = @@ -346,14 +341,8 @@ hk_GetDescriptorSetLayoutSupport( 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 = hk_descriptor_get_type_list(binding->descriptorType, mutable_info, i);