v3dv: fix pool descriptor count for inline uniform buffers

Fixes VK_ERROR_OUT_OF_POOL_MEMORY in the inlineuniformblocks
sample from Sascha Willems.

Fixes: ea3223e7a4 ('v3dv: implement VK_EXT_inline_uniform_block')
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17311>
(cherry picked from commit 7b91b39ba5)
This commit is contained in:
Iago Toral Quiroga 2022-06-30 13:34:32 +02:00 committed by Dylan Baker
parent 040658cd26
commit e1cf74f53b
2 changed files with 2 additions and 2 deletions

View file

@ -1048,7 +1048,7 @@
"description": "v3dv: fix pool descriptor count for inline uniform buffers",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ea3223e7a4690571583f3a0f2d7c9580952e67d8"
},

View file

@ -410,7 +410,7 @@ v3dv_CreateDescriptorPool(VkDevice _device,
* size as the size in bytes of the block.
*/
assert(inline_info);
descriptor_count++;
descriptor_count += inline_info->maxInlineUniformBlockBindings;
bo_size += pCreateInfo->pPoolSizes[i].descriptorCount;
} else {
descriptor_count += pCreateInfo->pPoolSizes[i].descriptorCount;