radeonsi: prepare clamp, alpha test before mrtz prepare

Signed-off-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15098>

diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c b/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c
index a38472e..ca86389 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c
@@ -845,6 +845,7 @@ void si_llvm_build_ps_epilog(struct si_shader_context *ctx, union si_shader_part
 {
    int i;
    struct si_ps_exports exp = {};
+   LLVMValueRef color[8][4];
 
    memset(&ctx->args, 0, sizeof(ctx->args));
 
@@ -868,6 +869,30 @@ void si_llvm_build_ps_epilog(struct si_shader_context *ctx, union si_shader_part
    /* Disable elimination of unused inputs. */
    ac_llvm_add_target_dep_function_attr(ctx->main_fn, "InitialPSInputAddr", 0xffffff);
 
+   /* Prepare color. */
+   unsigned vgpr = ctx->args.num_sgprs_used;
+   unsigned colors_written = key->ps_epilog.colors_written;
+
+   while (colors_written) {
+      int write_i = u_bit_scan(&colors_written);
+      unsigned color_type = (key->ps_epilog.color_types >> (write_i * 2)) & 0x3;
+
+      if (color_type != SI_TYPE_ANY32) {
+         for (i = 0; i < 4; i++) {
+            color[write_i][i] = LLVMGetParam(ctx->main_fn, vgpr + i / 2);
+            color[write_i][i] = LLVMBuildBitCast(ctx->ac.builder, color[write_i][i],
+                                                 ctx->ac.v2f16, "");
+            color[write_i][i] = ac_llvm_extract_elem(&ctx->ac, color[write_i][i], i % 2);
+         }
+         vgpr += 4;
+      } else {
+         for (i = 0; i < 4; i++)
+            color[write_i][i] = LLVMGetParam(ctx->main_fn, vgpr++);
+      }
+
+      si_llvm_build_clamp_alpha_test(ctx, color[write_i], write_i);
+   }
+
    /* Prepare the mrtz export. */
    if (key->ps_epilog.writes_z ||
        key->ps_epilog.writes_stencil ||
@@ -888,28 +913,13 @@ void si_llvm_build_ps_epilog(struct si_shader_context *ctx, union si_shader_part
 
    /* Prepare color exports. */
    const unsigned first_color_export = exp.num;
-   unsigned vgpr = ctx->args.num_sgprs_used;
-   unsigned colors_written = key->ps_epilog.colors_written;
+   colors_written = key->ps_epilog.colors_written;
 
    while (colors_written) {
-      LLVMValueRef color[4];
-      int output_index = u_bit_scan(&colors_written);
-      unsigned color_type = (key->ps_epilog.color_types >> (output_index * 2)) & 0x3;
-
-      if (color_type != SI_TYPE_ANY32) {
-         for (i = 0; i < 4; i++) {
-            color[i] = LLVMGetParam(ctx->main_fn, vgpr + i / 2);
-            color[i] = LLVMBuildBitCast(ctx->ac.builder, color[i], ctx->ac.v2f16, "");
-            color[i] = ac_llvm_extract_elem(&ctx->ac, color[i], i % 2);
-         }
-         vgpr += 4;
-      } else {
-         for (i = 0; i < 4; i++)
-            color[i] = LLVMGetParam(ctx->main_fn, vgpr++);
-      }
+      int write_i = u_bit_scan(&colors_written);
+      unsigned color_type = (key->ps_epilog.color_types >> (write_i * 2)) & 0x3;
 
-      si_llvm_build_clamp_alpha_test(ctx, color, output_index);
-      si_export_mrt_color(ctx, color, output_index, first_color_export, color_type, &exp);
+      si_export_mrt_color(ctx, color[write_i], write_i, first_color_export, color_type, &exp);
    }
 
    if (exp.num) {