Mesa (master): radeonsi: fix monolithic pixel shaders with two-sided colors and SampleMaskIn

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4249a90f5d635e4bec636fc320e492bbebbcee68
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4249a90f5d635e4bec636fc320e492bbebbcee68

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Dec 27 16:29:16 2019 -0500

radeonsi: fix monolithic pixel shaders with two-sided colors and SampleMaskIn

They are never used except for testing AMD_DEBUG=mono.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 65a070b4570..75c54a4b112 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -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,