Mesa (main): nir: Rename nir_gather_xfb_info to nir_shader_get_xfb_info

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3e04432b3a5b0ecdcb75b97b9cc5bb7fdc5ca218
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e04432b3a5b0ecdcb75b97b9cc5bb7fdc5ca218

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Tue May 17 10:56:52 2022 -0500

nir: Rename nir_gather_xfb_info to nir_shader_get_xfb_info

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16750>

---

 src/amd/vulkan/radv_pipeline.c                | 2 +-
 src/amd/vulkan/radv_shader_info.c             | 2 +-
 src/compiler/nir/nir_gather_xfb_info.c        | 2 +-
 src/compiler/nir/nir_xfb_info.h               | 2 +-
 src/freedreno/vulkan/tu_shader.c              | 2 +-
 src/gallium/frontends/lavapipe/lvp_pipeline.c | 2 +-
 src/intel/vulkan/anv_pipeline.c               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index ce4f5efe78a..6190704c6cb 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2816,7 +2816,7 @@ radv_nir_stage_uses_xfb(const nir_shader *nir)
    if (nir->info.stage == MESA_SHADER_MESH)
       return false;
 
-   nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
+   nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
    bool uses_xfb = !!xfb;
 
    ralloc_free(xfb);
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 01278686367..64f9d781ba7 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -399,7 +399,7 @@ gather_info_output_decl(const nir_shader *nir, const nir_variable *var,
 static void
 gather_xfb_info(const nir_shader *nir, struct radv_shader_info *info)
 {
-   nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
+   nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
    struct radv_streamout_info *so = &info->so;
 
    if (!xfb)
diff --git a/src/compiler/nir/nir_gather_xfb_info.c b/src/compiler/nir/nir_gather_xfb_info.c
index 88cadf9d82f..124a8e3f973 100644
--- a/src/compiler/nir/nir_gather_xfb_info.c
+++ b/src/compiler/nir/nir_gather_xfb_info.c
@@ -179,7 +179,7 @@ compare_xfb_output_offsets(const void *_a, const void *_b)
 }
 
 nir_xfb_info *
-nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx)
+nir_shader_get_xfb_info(const nir_shader *shader, void *mem_ctx)
 {
    return nir_gather_xfb_info_with_varyings(shader, mem_ctx, NULL);
 }
diff --git a/src/compiler/nir/nir_xfb_info.h b/src/compiler/nir/nir_xfb_info.h
index 28126425630..7e88529b8ee 100644
--- a/src/compiler/nir/nir_xfb_info.h
+++ b/src/compiler/nir/nir_xfb_info.h
@@ -75,7 +75,7 @@ nir_xfb_info_size(uint16_t output_count)
 }
 
 nir_xfb_info *
-nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx);
+nir_shader_get_xfb_info(const nir_shader *shader, void *mem_ctx);
 
 nir_xfb_info *
 nir_gather_xfb_info_with_varyings(const nir_shader *shader,
diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index 188fdf679fd..910e7fe7558 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -661,7 +661,7 @@ shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align)
 static void
 tu_gather_xfb_info(nir_shader *nir, struct ir3_stream_output_info *info)
 {
-   nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
+   nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
 
    if (!xfb)
       return;
diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index 738411f6c8b..8971c5e8955 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -1121,7 +1121,7 @@ lvp_pipeline_compile(struct lvp_pipeline *pipeline,
       if (stage == MESA_SHADER_VERTEX ||
           stage == MESA_SHADER_GEOMETRY ||
           stage == MESA_SHADER_TESS_EVAL) {
-         nir_xfb_info *xfb_info = nir_gather_xfb_info(pipeline->pipeline_nir[stage], NULL);
+         nir_xfb_info *xfb_info = nir_shader_get_xfb_info(pipeline->pipeline_nir[stage], NULL);
          if (xfb_info) {
             uint8_t output_mapping[VARYING_SLOT_TESS_MAX];
             memset(output_mapping, 0, sizeof(output_mapping));
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 3139340e8ff..6675deb73b3 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -1774,7 +1774,7 @@ anv_pipeline_compile_graphics(struct anv_graphics_pipeline *pipeline,
       if (s == MESA_SHADER_VERTEX ||
           s == MESA_SHADER_TESS_EVAL ||
           s == MESA_SHADER_GEOMETRY)
-         xfb_info = nir_gather_xfb_info(stages[s].nir, stage_ctx);
+         xfb_info = nir_shader_get_xfb_info(stages[s].nir, stage_ctx);
 
       switch (s) {
       case MESA_SHADER_VERTEX: