From d14a3debb5b867c5591c6fa0ae3ecd2b7869f5a8 Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Tue, 20 Jan 2026 12:06:20 -0500
Subject: [PATCH] hk: 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/asahi/vulkan/hk_cmd_buffer.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/asahi/vulkan/hk_cmd_buffer.c b/src/asahi/vulkan/hk_cmd_buffer.c
index e672b1da061..7b68d8cc49d 100644
--- a/src/asahi/vulkan/hk_cmd_buffer.c
+++ b/src/asahi/vulkan/hk_cmd_buffer.c
@@ -378,13 +378,8 @@ hk_bind_descriptor_sets(UNUSED struct hk_cmd_buffer *cmd,
     * it changes set_dynamic_buffer_start[s], this binding is implicitly
     * invalidated.
     */
-   uint8_t dyn_buffer_start = 0u;
-   for (uint32_t i = 0u; i < info->firstSet; ++i) {
-      const struct hk_descriptor_set_layout *set_layout =
-         vk_to_hk_descriptor_set_layout(pipeline_layout->set_layouts[i]);
-      if (set_layout)
-         dyn_buffer_start += set_layout->vk.dynamic_descriptor_count;
-   }
+   uint8_t dyn_buffer_start =
+      pipeline_layout->dynamic_descriptor_offset[info->firstSet];
 
    uint32_t next_dyn_offset = 0;
    for (uint32_t i = 0; i < info->descriptorSetCount; ++i) {