fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 21:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi: use vk_descriptor_type_is_dynamic

Browse source 
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 3b94bd03c2
commit 57dc5bb31f
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/asahi/vulkan/hk_descriptor_set.c
View file

@ -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;
}
}
}

15
src/asahi/vulkan/hk_descriptor_set_layout.c
View file

@ -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);