commit f8c1d79f69a8438d96a8177a877249a7ac22ae37
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Wed Nov 04 11:13:55 2020 -0500
committer Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Wed Nov 04 11:21:29 2020 -0500
tree 5042be462f395ac49b012e6c65448fbc3c6166c0
parent 9a6dad18d8d716534a0b870cf0ac7a9b5b9d25af

pan/bi: Correctly calculate render target index

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

src/panfrost/bifrost/bifrost_compile.c

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index a62aa82..68ca813 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -305,6 +305,11 @@
         bool emit_blend = writeout & (PAN_WRITEOUT_C);
         bool emit_zs = writeout & (PAN_WRITEOUT_Z | PAN_WRITEOUT_S);
 
+        const nir_variable *var =
+                nir_find_variable_with_driver_location(ctx->nir, nir_var_shader_out,
+                         nir_intrinsic_base(instr));
+        assert(var);
+
         if (!ctx->emitted_atest && !ctx->is_blend) {
                 bi_emit_atest(ctx,
                         pan_src_index(&instr->src[0]),
@@ -323,10 +328,16 @@
         }
 
         if (emit_blend) {
+                unsigned loc = var->data.location;
+                assert(loc == FRAG_RESULT_COLOR || loc >= FRAG_RESULT_DATA0);
+
+                unsigned rt = loc == FRAG_RESULT_COLOR ? 0 :
+                        (loc - FRAG_RESULT_DATA0);
+
                 bi_emit_blend(ctx,
                                 pan_src_index(&instr->src[0]),
                                 nir_intrinsic_src_type(instr),
-                                nir_intrinsic_base(instr));
+                                rt);
         }
 
         if (ctx->is_blend) {