Module: Mesa Branch: main Commit: e88b4949de798b4fabc5f77be5c5bccf91f332e5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e88b4949de798b4fabc5f77be5c5bccf91f332e5
Author: Alyssa Rosenzweig <[email protected]> Date: Mon Aug 15 18:55:17 2022 +0000 pan/decode: Reorder MFBD decoding Eliminate some #ifdef by grouping v5 and v6 state separately. Signed-off-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Boris Brezillon <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18094> --- src/panfrost/lib/genxml/decode.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/lib/genxml/decode.c index 15c1481b4df..9780296a8f2 100644 --- a/src/panfrost/lib/genxml/decode.c +++ b/src/panfrost/lib/genxml/decode.c @@ -278,23 +278,19 @@ pandecode_mfbd_bfr(uint64_t gpu_va, bool is_fragment, unsigned gpu_id) pandecode_log("Post frame:\n"); pandecode_dcd(&draw, MALI_JOB_TYPE_FRAGMENT, gpu_id); } -#endif - - pandecode_log("Multi-Target Framebuffer:\n"); - pandecode_indent++; - -#if PAN_ARCH <= 5 +#else DUMP_SECTION(FRAMEBUFFER, LOCAL_STORAGE, fb, "Local Storage:\n"); -#endif - DUMP_UNPACKED(FRAMEBUFFER_PARAMETERS, params, "Parameters:\n"); - -#if PAN_ARCH <= 5 const void *t = pan_section_ptr(fb, FRAMEBUFFER, TILER); const void *w = pan_section_ptr(fb, FRAMEBUFFER, TILER_WEIGHTS); pandecode_midgard_tiler_descriptor(t, w); #endif + pandecode_log("Multi-Target Framebuffer:\n"); + pandecode_indent++; + + DUMP_UNPACKED(FRAMEBUFFER_PARAMETERS, params, "Parameters:\n"); + pandecode_indent--; pandecode_log("\n");
