radv: fix the maximum variable descriptor count with inline uniform blocks

It must not be larger than maxInlineUniformBlockSize.

Fixes recent VKCTS
dEQP-VK.api.maintenance3_check.support_count_inline_uniform_block*.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36044>
(cherry picked from commit b7f4e344bc)
This commit is contained in:
Samuel Pitoiset 2025-07-10 14:42:05 +02:00 committed by Eric Engestrom
parent 1523bff2ae
commit 5e21a042c4
2 changed files with 2 additions and 2 deletions

View file

@ -3544,7 +3544,7 @@
"description": "radv: fix the maximum variable descriptor count with inline uniform blocks",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -440,7 +440,7 @@ radv_GetDescriptorSetLayoutSupport(VkDevice device, const VkDescriptorSetLayoutC
uint64_t max_count = INT32_MAX;
if (binding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK)
max_count = INT32_MAX - size;
max_count = MAX_INLINE_UNIFORM_BLOCK_SIZE - size;
else if (descriptor_size)
max_count = (INT32_MAX - size) / descriptor_size;