radv: fix VGT_GS_MODE if VS uses the primitive ID

Found by inspection.

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 47f3f7887d10acb9c0c36eef83a869119ec0230e..9338fcd550a559225bda1982b080e26ca63b6d72 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -3267,6 +3267,10 @@ radv_pipeline_generate_vgt_gs_mode(struct radeon_cmdbuf *ctx_cs,
                                    struct radv_pipeline *pipeline)
 {
        const struct radv_vs_output_info *outinfo = get_vs_output_info(pipeline);
+       const struct radv_shader_variant *vs =
+               pipeline->shaders[MESA_SHADER_TESS_EVAL] ?
+               pipeline->shaders[MESA_SHADER_TESS_EVAL] :
+               pipeline->shaders[MESA_SHADER_VERTEX];
        unsigned vgt_primitiveid_en = 0;
        uint32_t vgt_gs_mode = 0;
 
@@ -3277,16 +3281,12 @@ radv_pipeline_generate_vgt_gs_mode(struct radeon_cmdbuf *ctx_cs,
                vgt_gs_mode = ac_vgt_gs_mode(gs->info.gs.vertices_out,
                                             pipeline->device->physical_device->rad_info.chip_class);
        } else if (radv_pipeline_has_ngg(pipeline)) {
-               const struct radv_shader_variant *vs =
-                       pipeline->shaders[MESA_SHADER_TESS_EVAL] ?
-                       pipeline->shaders[MESA_SHADER_TESS_EVAL] :
-                       pipeline->shaders[MESA_SHADER_VERTEX];
                bool enable_prim_id =
                        outinfo->export_prim_id || vs->info.info.uses_prim_id;
 
                vgt_primitiveid_en |= S_028A84_PRIMITIVEID_EN(enable_prim_id) |
                                      S_028A84_NGG_DISABLE_PROVOK_REUSE(enable_prim_id);
-       } else if (outinfo->export_prim_id) {
+       } else if (outinfo->export_prim_id || vs->info.info.uses_prim_id) {
                vgt_gs_mode = S_028A40_MODE(V_028A40_GS_SCENARIO_A);
                vgt_primitiveid_en |= S_028A84_PRIMITIVEID_EN(1);
        }