From de0fa4de5fdc8a70b2d8b8caa8da09307b6b704a Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 7 Jan 2021 13:14:21 +0100 Subject: [PATCH] pan/bi: Port bi_collect_blend_ret_addr() to the new compiler infra Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- 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