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

anv: relax restriction on variable count descriptors

Browse source 
VUID-VkDescriptorSetAllocateInfo-pSetLayouts-09380 says that :

   "If pSetLayouts[i] was created with an element of pBindingFlags
   that includes VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT,
   and VkDescriptorSetVariableDescriptorCountAllocateInfo is included
   in the pNext chain, and
   VkDescriptorSetVariableDescriptorCountAllocateInfo::descriptorSetCount
   is not zero, then
   VkDescriptorSetVariableDescriptorCountAllocateInfo::pDescriptorCounts[i]
   must be less than or equal to
   VkDescriptorSetLayoutBinding::descriptorCount for the corresponding
   binding used to create pSetLayouts[i]"

But applications like are not following the spec. RADV doesn't apply
that limit and allocates if there is enough space in the pool. Let's
just do the same.

Note that this issue got resolved with a vkd3d-proton change :

a7ac1a7d2f

But since this change is deleting more code than it adds, might as
well go with it.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12185
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32305>
This commit is contained in:
Lionel Landwerlin 2024-11-22 17:17:53 +02:00
parent 3d7bfcf984
commit 76096d04bb
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/intel/vulkan/anv_descriptor_set.c
View file

@ -929,13 +929,12 @@ set_layout_descriptor_count(const struct anv_descriptor_set_layout *set_layout,
if (dynamic_binding == NULL) if (dynamic_binding == NULL)
return set_layout->descriptor_count; return set_layout->descriptor_count;
assert(var_desc_count <= dynamic_binding->array_size);
uint32_t shrink = dynamic_binding->array_size - var_desc_count;
if (dynamic_binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) if (dynamic_binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK)
return set_layout->descriptor_count; return set_layout->descriptor_count;
return set_layout->descriptor_count - shrink; return set_layout->descriptor_count -
dynamic_binding->array_size + var_desc_count;
} }
static uint32_t static uint32_t
@ -947,13 +946,11 @@ set_layout_buffer_view_count(const struct anv_descriptor_set_layout *set_layout,
if (dynamic_binding == NULL) if (dynamic_binding == NULL)
return set_layout->buffer_view_count; return set_layout->buffer_view_count;
assert(var_desc_count <= dynamic_binding->array_size);
uint32_t shrink = dynamic_binding->array_size - var_desc_count;
if (!(dynamic_binding->data & ANV_DESCRIPTOR_BUFFER_VIEW)) if (!(dynamic_binding->data & ANV_DESCRIPTOR_BUFFER_VIEW))
return set_layout->buffer_view_count; return set_layout->buffer_view_count;
return set_layout->buffer_view_count - shrink; return set_layout->buffer_view_count -
dynamic_binding->array_size + var_desc_count;
} }
static bool static bool
@ -977,25 +974,23 @@ anv_descriptor_set_layout_descriptor_buffer_size(const struct anv_descriptor_set
return; return;
} }
assert(var_desc_count <= dynamic_binding->array_size);
uint32_t shrink = dynamic_binding->array_size - var_desc_count;
uint32_t set_surface_size, set_sampler_size; uint32_t set_surface_size, set_sampler_size;
if (dynamic_binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if (dynamic_binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) {
/* Inline uniform blocks are specified to use the descriptor array /* Inline uniform blocks are specified to use the descriptor array
* size as the size in bytes of the block. * size as the size in bytes of the block.
*/ */
set_surface_size = set_layout->descriptor_buffer_surface_size - shrink; set_surface_size = set_layout->descriptor_buffer_surface_size -
dynamic_binding->array_size + var_desc_count;
set_sampler_size = 0; set_sampler_size = 0;
} else { } else {
set_surface_size = set_surface_size =
set_layout->descriptor_buffer_surface_size > 0 ? set_layout->descriptor_buffer_surface_size -
(set_layout->descriptor_buffer_surface_size - dynamic_binding->array_size * dynamic_binding->descriptor_surface_stride +
shrink * dynamic_binding->descriptor_surface_stride) : 0; var_desc_count * dynamic_binding->descriptor_surface_stride;
set_sampler_size = set_sampler_size =
set_layout->descriptor_buffer_sampler_size > 0 ? set_layout->descriptor_buffer_sampler_size -
(set_layout->descriptor_buffer_sampler_size - dynamic_binding->array_size * dynamic_binding->descriptor_sampler_stride -
shrink * dynamic_binding->descriptor_sampler_stride) : 0; var_desc_count * dynamic_binding->descriptor_sampler_stride;
} }
*out_surface_size = ALIGN(set_surface_size, ANV_UBO_ALIGNMENT); *out_surface_size = ALIGN(set_surface_size, ANV_UBO_ALIGNMENT);