radeonsi: fix monolithic pixel shaders with two-sided colors and SampleMaskIn
authorMarek Olšák <marek.olsak@amd.com>
Fri, 27 Dec 2019 21:29:16 +0000 (16:29 -0500)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 8 Jan 2020 20:48:35 +0000 (15:48 -0500)
They are never used except for testing AMD_DEBUG=mono.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
src/gallium/drivers/radeonsi/si_shader.c

index 65a070b4570ea72a370b9fc65e51561ad3be6af2..75c54a4b112bfd003b899a7277250fa3244cb1e7 100644 (file)
@@ -3716,12 +3716,12 @@ static void create_function(struct si_shader_context *ctx)
                                &ctx->args.frag_pos[2], SI_PARAM_POS_Z_FLOAT);
                add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.frag_pos[3], SI_PARAM_POS_W_FLOAT);
+               shader->info.face_vgpr_index = ctx->args.num_vgprs_used;
                add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
                                &ctx->args.front_face, SI_PARAM_FRONT_FACE);
-               shader->info.face_vgpr_index = 20;
+               shader->info.ancillary_vgpr_index = ctx->args.num_vgprs_used;
                add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
                                &ctx->args.ancillary, SI_PARAM_ANCILLARY);
-               shader->info.ancillary_vgpr_index = 21;
                add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.sample_coverage, SI_PARAM_SAMPLE_COVERAGE);
                add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,