commit dabb6c6b9fd473b10ae9d63b96e7ef248b1a7ed1
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Fri Mar 06 09:26:44 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Sat Mar 07 00:37:39 2020 +0000
tree 2e8cfc1b33a201d063dbb19145ecdab6303a73cb
parent 79c1af062341266d7ad64a0ac221394d6cbfdfdc

pan/bi: Implement store_output for fragment shaders

Corresponds to a BLEND instruction, possibly preceded by an ATEST
instruction.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4097>

src/panfrost/bifrost/bifrost_compile.c

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 6a57adc..9225912 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -89,6 +89,31 @@
 }
 
 static void
+bi_emit_frag_out(bi_context *ctx, nir_intrinsic_instr *instr)
+{
+        if (!ctx->emitted_atest) {
+                bi_instruction ins = {
+                        .type = BI_ATEST
+                };
+
+                bi_emit(ctx, ins);
+                bi_schedule_barrier(ctx);
+                ctx->emitted_atest = true;
+        }
+
+        bi_instruction blend = {
+                .type = BI_BLEND,
+                .blend_location = nir_intrinsic_base(instr),
+                .src = {
+                        bir_src_index(&instr->src[0])
+                }
+        };
+
+        bi_emit(ctx, blend);
+        bi_schedule_barrier(ctx);
+}
+
+static void
 emit_intrinsic(bi_context *ctx, nir_intrinsic_instr *instr)
 {
 
@@ -99,6 +124,13 @@
         case nir_intrinsic_load_interpolated_input:
                 bi_emit_ld_vary(ctx, instr);
                 break;
+        case nir_intrinsic_store_output:
+                if (ctx->stage == MESA_SHADER_FRAGMENT)
+                        bi_emit_frag_out(ctx, instr);
+                else {
+                        /* TODO */
+                }
+                break;
         default:
                 /* todo */
                 break;

src/panfrost/bifrost/compiler.h

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index 71d1b24..cbd76d5 100644
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -330,6 +330,7 @@
        bi_block *after_block;
        bi_block *break_block;
        bi_block *continue_block;
+       bool emitted_atest;
 
        /* Stats for shader-db */
        unsigned instruction_count;