commit 2680329fb7671917b03be5939dea974648313678
author Timur Kristóf <timur.kristof@gmail.com> Thu Sep 10 18:36:27 2020 +0200
committer Timur Kristóf <timur.kristof@gmail.com> Fri Oct 09 15:26:15 2020 +0200
tree dc435d3e48b9ec65515c9270a381f6569b18be96
parent 9c3d8404deaab24e1a4186035398250dbd6f542b

aco/ngg: Setup NGG GS.

Make it possible for ACO to recognize when to use HW NGG GS.
Also add a few notes about the various GS stages in the comments.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6964>

src/amd/compiler/aco_instruction_selection_setup.cpp

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 020cebd..f8e329f 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -495,12 +495,17 @@
 
 void setup_gs_variables(isel_context *ctx, nir_shader *nir)
 {
-   if (ctx->stage == vertex_geometry_gs || ctx->stage == tess_eval_geometry_gs)
+   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 */
+   } else if (ctx->stage == ngg_vertex_geometry_gs || ctx->stage == ngg_tess_eval_geometry_gs) {
+      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, outinfo);
+   }
 
-   if (ctx->stage == vertex_geometry_gs)
+   if (ctx->stage & sw_vs)
       ctx->program->info->gs.es_type = MESA_SHADER_VERTEX;
-   else if (ctx->stage == tess_eval_geometry_gs)
+   else if (ctx->stage & sw_tes)
       ctx->program->info->gs.es_type = MESA_SHADER_TESS_EVAL;
 }
 
@@ -1176,7 +1181,9 @@
    else if (stage == sw_gs_copy)
       stage |= hw_vs;
    else if (stage == (sw_vs | sw_gs) && gfx9_plus && !ngg)
-      stage |= hw_gs;
+      stage |= hw_gs; /* GFX6-9: VS+GS merged into a GS (and GFX10/legacy) */
+   else if (stage == (sw_vs | sw_gs) && ngg)
+      stage |= hw_ngg_gs; /* GFX10+: VS+GS merged into an NGG GS */
    else if (stage == sw_vs && args->shader_info->vs.as_ls)
       stage |= hw_ls; /* GFX6-8: VS is a Local Shader, when tessellation is used */
    else if (stage == sw_tcs)
@@ -1191,6 +1198,8 @@
       stage |= hw_es; /* GFX6-8: TES is an Export Shader */
    else if (stage == (sw_tes | sw_gs) && gfx9_plus && !ngg)
       stage |= hw_gs; /* GFX9: TES+GS merged into a GS (and GFX10/legacy) */
+   else if (stage == (sw_tes | sw_gs) && ngg)
+      stage |= hw_ngg_gs; /* GFX10+: TES+GS merged into an NGG GS */
    else
       unreachable("Shader stage not implemented");