commit 9c3d8404deaab24e1a4186035398250dbd6f542b
author Timur Kristóf <timur.kristof@gmail.com> Mon Sep 14 09:58:56 2020 +0200
committer Timur Kristóf <timur.kristof@gmail.com> Fri Oct 09 15:26:14 2020 +0200
tree 83e7d1d4bdae7d20e50fdb617decc74022c1b629
parent b67878f32830d25d37fc1c6930f45a95c6cd4648

aco/ngg: Allow NGG GS to create VS exports.

NGG GS need to use the same instructions to export vertex
attributes at the end.

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.cpp

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 8310517..f613184 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -9741,13 +9741,9 @@
 
 static bool export_vs_varying(isel_context *ctx, int slot, bool is_pos, int *next_pos)
 {
-   assert(ctx->stage == vertex_vs ||
-          ctx->stage == tess_eval_vs ||
-          ctx->stage == gs_copy_vs ||
-          ctx->stage == ngg_vertex_gs ||
-          ctx->stage == ngg_tess_eval_gs);
+   assert(ctx->stage & (hw_vs | hw_ngg_gs));
 
-   int offset = (ctx->stage & sw_tes)
+   int offset = ((ctx->stage & sw_tes) && !(ctx->stage & sw_gs))
                 ? ctx->program->info->tes.outinfo.vs_output_param_offset[slot]
                 : ctx->program->info->vs.outinfo.vs_output_param_offset[slot];
    uint64_t mask = ctx->outputs.mask[slot];
@@ -9844,13 +9840,9 @@
 
 static void create_vs_exports(isel_context *ctx)
 {
-   assert(ctx->stage == vertex_vs ||
-          ctx->stage == tess_eval_vs ||
-          ctx->stage == gs_copy_vs ||
-          ctx->stage == ngg_vertex_gs ||
-          ctx->stage == ngg_tess_eval_gs);
+   assert(ctx->stage & (hw_vs | hw_ngg_gs));
 
-   radv_vs_output_info *outinfo = (ctx->stage & sw_tes)
+   radv_vs_output_info *outinfo = ((ctx->stage & sw_tes) && !(ctx->stage & sw_gs))
                                   ? &ctx->program->info->tes.outinfo
                                   : &ctx->program->info->vs.outinfo;