Mesa (main): aco/info: reduce the gs ring info to what is needed.

[GitLab Mirror]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu May  5 12:11:53 2022 +1000

aco/info: reduce the gs ring info to what is needed.

Only one member was being used.

Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16342>

---

 src/amd/compiler/aco_instruction_selection_setup.cpp | 2 +-
 src/amd/compiler/aco_shader_info.h                   | 2 +-
 src/amd/vulkan/radv_aco_shader_info.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index dab56f32989..f6cf057a8b1 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -289,7 +289,7 @@ setup_gs_variables(isel_context* ctx, nir_shader* nir)
 {
    if (ctx->stage == vertex_geometry_gs || ctx->stage == tess_eval_geometry_gs) {
       ctx->program->config->lds_size =
-         ctx->program->info.gs_ring_info.lds_size; /* Already in units of the alloc granularity */
+         ctx->program->info.gfx9_gs_ring_lds_size; /* Already in units of the alloc granularity */
    } else if (ctx->stage == vertex_geometry_ngg || ctx->stage == tess_eval_geometry_ngg) {
       setup_vs_output_info(ctx, nir, &ctx->program->info.vs.outinfo);
 
diff --git a/src/amd/compiler/aco_shader_info.h b/src/amd/compiler/aco_shader_info.h
index 2600a6998f8..779ae0b5297 100644
--- a/src/amd/compiler/aco_shader_info.h
+++ b/src/amd/compiler/aco_shader_info.h
@@ -76,7 +76,7 @@ struct aco_shader_info {
    } ms;
    struct radv_streamout_info so;
 
-   struct gfx9_gs_info gs_ring_info;
+   uint32_t gfx9_gs_ring_lds_size;
 };
 
 #ifdef __cplusplus
diff --git a/src/amd/vulkan/radv_aco_shader_info.h b/src/amd/vulkan/radv_aco_shader_info.h
index 2e1a9a47698..2a7da8651f0 100644
--- a/src/amd/vulkan/radv_aco_shader_info.h
+++ b/src/amd/vulkan/radv_aco_shader_info.h
@@ -63,7 +63,7 @@ radv_aco_convert_shader_info(struct aco_shader_info *aco_info,
    ASSIGN_FIELD(cs.subgroup_size);
    ASSIGN_FIELD(ms.outinfo);
    ASSIGN_FIELD(so);
-   ASSIGN_FIELD(gs_ring_info);
+   aco_info->gfx9_gs_ring_lds_size = radv->gs_ring_info.lds_size;
 }
 #undef ASSIGN_FIELD
 #undef ASSIGN_FIELD_CP