From bd76444257071d655c4970958b9fa4fb3e3c8bd7 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 4 Jan 2024 17:46:30 -0600
Subject: [PATCH] nvk: Pass an array of descriptor sets to nvk_lower_nir

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27024>
---
 src/nouveau/vulkan/nvk_compute_pipeline.c  |  4 +++-
 src/nouveau/vulkan/nvk_graphics_pipeline.c |  4 +++-
 src/nouveau/vulkan/nvk_shader.c            | 26 ++++++++++++++++------
 src/nouveau/vulkan/nvk_shader.h            |  3 ++-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_compute_pipeline.c b/src/nouveau/vulkan/nvk_compute_pipeline.c
index e51b45794c3..5788666c132 100644
--- a/src/nouveau/vulkan/nvk_compute_pipeline.c
+++ b/src/nouveau/vulkan/nvk_compute_pipeline.c
@@ -214,7 +214,9 @@ nvk_compute_pipeline_create(struct nvk_device *dev,
       if(shader == NULL)
          return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
 
-      nvk_lower_nir(dev, nir, &robustness, false, pipeline_layout,
+      nvk_lower_nir(dev, nir, &robustness, false,
+                    pipeline_layout->set_count,
+                    pipeline_layout->set_layouts,
                     &shader->cbuf_map);
 
       result = nvk_compile_nir(dev, nir, pipeline_flags, &robustness, NULL, cache, shader);
diff --git a/src/nouveau/vulkan/nvk_graphics_pipeline.c b/src/nouveau/vulkan/nvk_graphics_pipeline.c
index 6e8efc597d3..a57891e4d18 100644
--- a/src/nouveau/vulkan/nvk_graphics_pipeline.c
+++ b/src/nouveau/vulkan/nvk_graphics_pipeline.c
@@ -248,7 +248,9 @@ nvk_graphics_pipeline_create(struct nvk_device *dev,
          }
 
          nvk_lower_nir(dev, nir[stage], &robustness[stage],
-                       state.rp->view_mask != 0, pipeline_layout,
+                       state.rp->view_mask != 0,
+                       pipeline_layout->set_count,
+                       pipeline_layout->set_layouts,
                        &shader->cbuf_map);
 
          result = nvk_compile_nir(dev, nir[stage],
diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c
index 0d4ffb338e0..77d4c66aea8 100644
--- a/src/nouveau/vulkan/nvk_shader.c
+++ b/src/nouveau/vulkan/nvk_shader.c
@@ -259,14 +259,20 @@ lower_load_global_constant_offset_instr(nir_builder *b,
    return true;
 }
 
+struct lower_ycbcr_state {
+   uint32_t set_layout_count;
+   struct vk_descriptor_set_layout * const *set_layouts;
+};
+
 static const struct vk_ycbcr_conversion_state *
-lookup_ycbcr_conversion(const void *_layout, uint32_t set,
+lookup_ycbcr_conversion(const void *_state, uint32_t set,
                         uint32_t binding, uint32_t array_index)
 {
-   const struct vk_pipeline_layout *pipeline_layout = _layout;
-   assert(set < pipeline_layout->set_count);
+   const struct lower_ycbcr_state *state = _state;
+   assert(set < state->set_layout_count);
+   assert(state->set_layouts[set] != NULL);
    const struct nvk_descriptor_set_layout *set_layout =
-      vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[set]);
+      vk_to_nvk_descriptor_set_layout(state->set_layouts[set]);
    assert(binding < set_layout->binding_count);
 
    const struct nvk_descriptor_set_binding_layout *bind_layout =
@@ -343,7 +349,8 @@ void
 nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
               const struct vk_pipeline_robustness_state *rs,
               bool is_multiview,
-              const struct vk_pipeline_layout *layout,
+              uint32_t set_layout_count,
+              struct vk_descriptor_set_layout * const *set_layouts,
               struct nvk_cbuf_map *cbuf_map_out)
 {
    struct nvk_physical_device *pdev = nvk_device_physical(dev);
@@ -358,7 +365,12 @@ nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
                });
    }
 
-   NIR_PASS(_, nir, nir_vk_lower_ycbcr_tex, lookup_ycbcr_conversion, layout);
+   const struct lower_ycbcr_state ycbcr_state = {
+      .set_layout_count = set_layout_count,
+      .set_layouts = set_layouts,
+   };
+   NIR_PASS(_, nir, nir_vk_lower_ycbcr_tex,
+            lookup_ycbcr_conversion, &ycbcr_state);
 
    nir_lower_compute_system_values_options csv_options = {
       .has_base_workgroup_id = true,
@@ -417,7 +429,7 @@ nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
    }
 
    NIR_PASS(_, nir, nvk_nir_lower_descriptors, rs,
-            layout->set_count, layout->set_layouts, cbuf_map);
+            set_layout_count, set_layouts, cbuf_map);
    NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_global,
             nir_address_format_64bit_global);
    NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_ssbo,
diff --git a/src/nouveau/vulkan/nvk_shader.h b/src/nouveau/vulkan/nvk_shader.h
index 9e77b2f78ba..08128bb95bc 100644
--- a/src/nouveau/vulkan/nvk_shader.h
+++ b/src/nouveau/vulkan/nvk_shader.h
@@ -131,7 +131,8 @@ void
 nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
               const struct vk_pipeline_robustness_state *rs,
               bool is_multiview,
-              const struct vk_pipeline_layout *layout,
+              uint32_t set_layout_count,
+              struct vk_descriptor_set_layout * const *set_layouts,
               struct nvk_cbuf_map *cbuf_map_out);
 
 VkResult