radeonsi/gfx10: fix input VGPRs for legacy VS

[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 7702d96391e970972a1686e184bd345cafd7b462..8d3763c15bfc9edf3c87ace500fa46066da9d426 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4594,10 +4594,9 @@ static void declare_vs_input_vgprs(struct si_shader_context *ctx,
                        add_arg_assign(fninfo, ARG_VGPR, ctx->i32, &ctx->abi.instance_id);
                        add_arg(fninfo, ARG_VGPR, ctx->i32); /* unused */
                }
-       } else if (ctx->screen->info.chip_class == GFX10 &&
-                  !shader->is_gs_copy_shader) {
-               add_arg(fninfo, ARG_VGPR, ctx->i32); /* user vgpr */
+       } else if (ctx->screen->info.chip_class >= GFX10) {
                add_arg(fninfo, ARG_VGPR, ctx->i32); /* user vgpr */
+               ctx->param_vs_prim_id = add_arg(fninfo, ARG_VGPR, ctx->i32); /* user vgpr or PrimID (legacy) */
                add_arg_assign(fninfo, ARG_VGPR, ctx->i32, &ctx->abi.instance_id);
        } else {
                add_arg_assign(fninfo, ARG_VGPR, ctx->i32, &ctx->abi.instance_id);