From b707dabbace352516061e8165b218e7de5003c1d Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 4 Feb 2022 17:21:04 -0500 Subject: [PATCH] pan/mdg: Pull out skip_internal boolean Aligns with Bifrost. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/midgard/midgard_compile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index f63e0aef8df..ce2ea2cbe7d 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -3217,10 +3217,11 @@ midgard_compile_shader_nir(nir_shader *nir, optimise_nir(nir, ctx->quirks, inputs->is_blend); - if ((midgard_debug & MIDGARD_DBG_SHADERS) && - ((midgard_debug & MIDGARD_DBG_INTERNAL) || !nir->info.internal)) { + bool skip_internal = nir->info.internal; + skip_internal &= !(midgard_debug & MIDGARD_DBG_INTERNAL); + + if (midgard_debug & MIDGARD_DBG_SHADERS && !skip_internal) nir_print_shader(nir, stdout); - } info->tls_size = nir->scratch_size; @@ -3342,8 +3343,7 @@ midgard_compile_shader_nir(nir_shader *nir, info->ubo_mask = ctx->ubo_mask & BITSET_MASK(ctx->nir->info.num_ubos); - if ((midgard_debug & MIDGARD_DBG_SHADERS) && - ((midgard_debug & MIDGARD_DBG_INTERNAL) || !nir->info.internal)) { + if (midgard_debug & MIDGARD_DBG_SHADERS && !skip_internal) { disassemble_midgard(stdout, binary->data, binary->size, inputs->gpu_id, midgard_debug & MIDGARD_DBG_VERBOSE);