Mesa (main): radv,aco: stop using vs_common_out.export_clip_dists

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Sep 24 14:10:39 2021 +0200

radv,aco: stop using vs_common_out.export_clip_dists

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13028>

---

 src/amd/compiler/aco_instruction_selection_setup.cpp |  6 +++---
 src/amd/vulkan/radv_nir_to_llvm.c                    | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 767e6fbf124..76e7c113d5a 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -340,7 +340,7 @@ setup_vs_variables(isel_context* ctx, nir_shader* nir)
    if (ctx->stage == vertex_vs || ctx->stage == vertex_ngg) {
       radv_vs_output_info* outinfo = &ctx->program->info->vs.outinfo;
       setup_vs_output_info(ctx, nir, outinfo->export_prim_id,
-                           ctx->options->key.vs_common_out.export_clip_dists, outinfo);
+                           outinfo->export_clip_dists, outinfo);
 
       /* TODO: NGG streamout */
       if (ctx->stage.hw == HWStage::NGG)
@@ -363,7 +363,7 @@ setup_gs_variables(isel_context* ctx, nir_shader* nir)
          ctx->program->info->gs_ring_info.lds_size; /* Already in units of the alloc granularity */
    } else if (ctx->stage == vertex_geometry_ngg || ctx->stage == tess_eval_geometry_ngg) {
       radv_vs_output_info* outinfo = &ctx->program->info->vs.outinfo;
-      setup_vs_output_info(ctx, nir, false, ctx->options->key.vs_common_out.export_clip_dists,
+      setup_vs_output_info(ctx, nir, false, outinfo->export_clip_dists,
                            outinfo);
 
       ctx->program->config->lds_size =
@@ -393,7 +393,7 @@ setup_tes_variables(isel_context* ctx, nir_shader* nir)
    if (ctx->stage == tess_eval_vs || ctx->stage == tess_eval_ngg) {
       radv_vs_output_info* outinfo = &ctx->program->info->tes.outinfo;
       setup_vs_output_info(ctx, nir, outinfo->export_prim_id,
-                           ctx->options->key.vs_common_out.export_clip_dists, outinfo);
+                           outinfo->export_clip_dists, outinfo);
 
       /* TODO: NGG streamout */
       if (ctx->stage.hw == HWStage::NGG)
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 12b1f1702fd..fc6e1ddee28 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1671,8 +1671,7 @@ handle_ngg_outputs_post_2(struct radv_shader_context *ctx)
 
       /* Exporting the primitive ID is handled below. */
       /* TODO: use the new VS export path */
-      handle_vs_outputs_post(ctx, false, ctx->args->options->key.vs_common_out.export_clip_dists,
-                             outinfo);
+      handle_vs_outputs_post(ctx, false, outinfo->export_clip_dists, outinfo);
 
       if (ctx->args->options->key.vs_common_out.export_prim_id) {
          unsigned param_count = outinfo->param_exports;
@@ -2011,8 +2010,7 @@ gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
          noutput++;
       }
 
-      radv_llvm_export_vs(ctx, outputs, noutput, outinfo,
-                          ctx->args->options->key.vs_common_out.export_clip_dists);
+      radv_llvm_export_vs(ctx, outputs, noutput, outinfo, outinfo->export_clip_dists);
       FREE(outputs);
    }
    ac_build_endif(&ctx->ac, 5145);
@@ -2200,7 +2198,7 @@ handle_shader_outputs_post(struct ac_shader_abi *abi)
          break;
       else
          handle_vs_outputs_post(ctx, ctx->args->options->key.vs_common_out.export_prim_id,
-                                ctx->args->options->key.vs_common_out.export_clip_dists,
+                                ctx->args->shader_info->vs.outinfo.export_clip_dists,
                                 &ctx->args->shader_info->vs.outinfo);
       break;
    case MESA_SHADER_FRAGMENT:
@@ -2218,7 +2216,7 @@ handle_shader_outputs_post(struct ac_shader_abi *abi)
          break;
       else
          handle_vs_outputs_post(ctx, ctx->args->options->key.vs_common_out.export_prim_id,
-                                ctx->args->options->key.vs_common_out.export_clip_dists,
+                                ctx->args->shader_info->tes.outinfo.export_clip_dists,
                                 &ctx->args->shader_info->tes.outinfo);
       break;
    default: