KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv: Ignore descriptor binding flags if bindingCount == 0 

I missed this on the first go round.  The bindingCount field of
VkDescriptorSetLayoutBindingFlagsCreateInfoEXT is allowed to be zero
which means the flags array is ignored.

Fixes: d6c9bd6e01 "anv: Put binding flags in descriptor set layouts"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand 2019-04-19 14:43:01 -05:00
parent 648cda258b
commit 2b388c3d04
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/vulkan/anv_descriptor_set.c
View File

@ -362,8 +362,6 @@ VkResult anv_CreateDescriptorSetLayout(
const VkDescriptorSetLayoutBindingFlagsCreateInfoEXT *binding_flags_info =
vk_find_struct_const(pCreateInfo->pNext,
DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT);
if (binding_flags_info)
assert(binding_flags_info->bindingCount == pCreateInfo->bindingCount);
for (uint32_t b = 0; b <= max_binding; b++) {
const VkDescriptorSetLayoutBinding *binding =
@ -385,7 +383,8 @@ VkResult anv_CreateDescriptorSetLayout(
set_layout->binding[b].type = binding->descriptorType;
#endif
if (binding_flags_info) {
if (binding_flags_info && binding_flags_info->bindingCount > 0) {
assert(binding_flags_info->bindingCount == pCreateInfo->bindingCount);
uint32_t binding_strct_idx = binding - pCreateInfo->pBindings;
assert(binding_strct_idx < binding_flags_info->bindingCount);
set_layout->binding[b].flags =