From 7b91b39ba517d8bccf3c44007d1acfaf4fac84c0 Mon Sep 17 00:00:00 2001
From: Iago Toral Quiroga <itoral@igalia.com>
Date: Thu, 30 Jun 2022 13:34:32 +0200
Subject: [PATCH] v3dv: fix pool descriptor count for inline uniform buffers
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes VK_ERROR_OUT_OF_POOL_MEMORY in the inlineuniformblocks
sample from Sascha Willems.

Fixes: ea3223e7a46 ('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>
---
 src/broadcom/vulkan/v3dv_descriptor_set.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/broadcom/vulkan/v3dv_descriptor_set.c b/src/broadcom/vulkan/v3dv_descriptor_set.c
index 9bd50cc..ade4d2b 100644
--- a/src/broadcom/vulkan/v3dv_descriptor_set.c
+++ b/src/broadcom/vulkan/v3dv_descriptor_set.c
@@ -450,7 +450,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;
-- 
2.7.4