mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

Update bitset when init descriptor layout. 

Signed-off-by: Dawn Han <dawnhan@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17505>
This commit is contained in:
Dawn Han 2022-08-03 05:25:59 +00:00 committed by Marge Bot
parent 7039467522
commit d5f116feb5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/virtio/vulkan/vn_descriptor_set.c
View File

@ -129,6 +129,10 @@ vn_descriptor_set_layout_init(
vk_find_struct_const(create_info->pNext,
DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO);
const VkMutableDescriptorTypeCreateInfoVALVE *mutable_descriptor_info =
vk_find_struct_const(create_info->pNext,
MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE);
/* 14.2.1. Descriptor Set Layout
*
* If bindingCount is zero or if this structure is not included in
@ -176,6 +180,19 @@ vn_descriptor_set_layout_init(
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
binding->has_immutable_samplers = binding_info->pImmutableSamplers;
break;
case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE:
assert(mutable_descriptor_info->mutableDescriptorTypeListCount &&
mutable_descriptor_info->pMutableDescriptorTypeLists[i]
.descriptorTypeCount);
const VkMutableDescriptorTypeListVALVE *list =
&mutable_descriptor_info->pMutableDescriptorTypeLists[i];
for (uint32_t j = 0; j < list->descriptorTypeCount; j++) {
BITSET_SET(binding->mutable_descriptor_types,
vn_descriptor_type_index(list->pDescriptorTypes[j]));
}
break;
default:
break;
}

1
src/virtio/vulkan/vn_descriptor_set.h
View File

@ -41,6 +41,7 @@ struct vn_descriptor_set_layout_binding {
VkDescriptorType type;
uint32_t count;
bool has_immutable_samplers;
BITSET_DECLARE(mutable_descriptor_types, VN_NUM_DESCRIPTOR_TYPES);
};
struct vn_descriptor_set_layout {