From 7f75b2b5af0944d060cff8ee66eb138ba937d3bd Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 30 Jul 2019 17:07:25 -0700 Subject: [PATCH] pan/midgard: Simplify discard logic The "branch offset" is, in fact, ignored. Signed-off-by: Alyssa Rosenzweig --- src/panfrost/midgard/midgard_compile.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 1efc5538b42..a03740acf7d 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2409,23 +2409,7 @@ midgard_compile_shader_nir(struct midgard_screen *screen, nir_shader *nir, midga int quadword_offset = 0; if (is_discard) { - /* Jump to the end of the shader. We - * need to include not only the - * following blocks, but also the - * contents of our current block (since - * discard can come in the middle of - * the block) */ - - midgard_block *blk = mir_get_block(ctx, br_block_idx + 1); - - for (midgard_bundle *bun = bundle + 1; bun < (midgard_bundle *)((char*) block->bundles.data + block->bundles.size); ++bun) { - quadword_offset += quadword_size(bun->tag); - } - - mir_foreach_block_from(ctx, blk, b) { - quadword_offset += b->quadword_count; - } - + /* Ignored */ } else if (target_number > br_block_idx) { /* Jump forward */ -- 2.30.2