From c8e47ab40cfc84f4ffa0db74b2476fbeb4cc9a0c Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Mon, 19 Jan 2026 17:35:42 -0500
Subject: [PATCH] nvk: Use pipeline_layout.dynamic_descriptor_offset

Reviewed-by: Aitor Camacho <aitor@lunarg.com>
Reviewed-by: Mary Guillemard <mary@mary.zone>
Tested-by: Mary Guillemard <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39411>
---
 src/nouveau/vulkan/nvk_cmd_buffer.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 16e0ef5f008..bece9b0fa65 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -863,14 +863,9 @@ nvk_bind_descriptor_sets(struct nvk_cmd_buffer *cmd,
     * it changes set_dynamic_buffer_start[s], this binding is implicitly
     * invalidated.
     */
-   uint8_t dyn_buffer_end = 0u;
-   for (uint32_t i = 0u; i < info->firstSet; ++i) {
-      const struct nvk_descriptor_set_layout *set_layout =
-         vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[i]);
-      if (set_layout)
-         dyn_buffer_end += set_layout->vk.dynamic_descriptor_count;
-   }
-   const uint8_t dyn_buffer_start = dyn_buffer_end;
+   const uint8_t dyn_buffer_start =
+      pipeline_layout->dynamic_descriptor_offset[info->firstSet];
+   uint8_t dyn_buffer_end = dyn_buffer_start;
 
    uint32_t next_dyn_offset = 0;
    for (uint32_t i = 0; i < info->descriptorSetCount; ++i) {