Mesa (staging/22.1): v3dv: fix pool descriptor count for inline uniform buffers

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: e1cf74f53bfbaa5af4d976ea8274e3b837b7cf6b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1cf74f53bfbaa5af4d976ea8274e3b837b7cf6b

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Thu Jun 30 13:34:32 2022 +0200

v3dv: fix pool descriptor count for inline uniform buffers

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 at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17311>
(cherry picked from commit 7b91b39ba517d8bccf3c44007d1acfaf4fac84c0)

---

 .pick_status.json                         | 2 +-
 src/broadcom/vulkan/v3dv_descriptor_set.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index aac27f7946a..84d8ebab4d7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -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"
     },
diff --git a/src/broadcom/vulkan/v3dv_descriptor_set.c b/src/broadcom/vulkan/v3dv_descriptor_set.c
index 653f5d39d05..7661a07c32d 100644
--- a/src/broadcom/vulkan/v3dv_descriptor_set.c
+++ b/src/broadcom/vulkan/v3dv_descriptor_set.c
@@ -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;