fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: handle 0 count for vdc when checking if layout is supported

Browse source 
A binding with variable descriptor count should be counted when checking
if a descriptor set layout is supported, even if it has a count of zero.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Fixes: 5fe5e317 ("panvk: advertise descriptor indexing on valhall")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35545>
This commit is contained in:
John Anthony 2025-06-19 14:07:49 +02:00 • committed by Marge Bot
parent 5023feb0f7
commit 1b309e77fc
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c
View file

@ -291,14 +291,47 @@ panvk_per_arch(GetDescriptorSetLayoutSupport)(
unsigned stride = panvk_get_desc_stride(&layout);
unsigned binding_desc_count = binding->descriptorCount;
bool has_variable_count =
flags & VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT;
if (has_variable_count) {
/* From the Vulkan 1.4.318 spec for
* VkDescriptorSetLayoutBindingFlagsCreateInfo:
*
* "If an element of pBindingFlags includes
* VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT, then it
* must be the element with the highest binding number"
*
* Which implies only a single binding can have a variable count.
*/
assert(!variable_stride);
if (binding_desc_count == 0) {
/* From the Vulkan 1.4.318 spec for
* VkDescriptorSetVariableDescriptorCountLayoutSupport:
*
* "For the purposes of this command, a variable-sized
* descriptor binding with a descriptorCount of zero is treated
* as having a descriptorCount of four if descriptorType is
* VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, or one otherwise,
* and thus the binding is not ignored and the maximum
* descriptor count will be returned."
*/
binding_desc_count =
type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK ? 4 : 1;
}
variable_stride = stride;
assert(variable_stride);
}
unsigned count = type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK
? panvk_get_iub_desc_count(binding_desc_count)
: stride * binding_desc_count;
desc_count += count;
if (flags & VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT)
variable_stride = stride;
else
if (!has_variable_count)
non_variable_count += count;
}