Mesa (master): pan/bi: Port bi_collect_blend_ret_addr() to the new compiler infra

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Jan  7 13:14:21 2021 +0100

pan/bi: Port bi_collect_blend_ret_addr() to the new compiler infra

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8417>

---

 src/panfrost/bifrost/bi_pack.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 136875e1ef2..400b63880df 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -699,13 +699,12 @@ bi_collect_blend_ret_addr(bi_context *ctx, struct util_dynarray *emission,
          */
         assert(0);
 
-#if 0
-        assert(ins->blend_location < ARRAY_SIZE(ctx->blend_ret_offsets));
-        assert(!ctx->blend_ret_offsets[ins->blend_location]);
-        ctx->blend_ret_offsets[ins->blend_location] =
+        unsigned loc = bundle->regs.fau_idx - BIR_FAU_BLEND_0;
+        assert(loc < ARRAY_SIZE(ctx->blend_ret_offsets));
+        assert(!ctx->blend_ret_offsets[loc]);
+        ctx->blend_ret_offsets[loc] =
                 util_dynarray_num_elements(emission, uint8_t);
-        assert(!(ctx->blend_ret_offsets[ins->blend_location] & 0x7));
-#endif
+        assert(!(ctx->blend_ret_offsets[loc] & 0x7));
 }
 
 void