From e823a47f0213907957feb6a30fa664d35901ae96 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 13 Aug 2019 11:10:06 -0700 Subject: [PATCH] pan/midgard: Disassemble UBO index explicitly It's a bit of a special case but that's fine. Signed-off-by: Alyssa Rosenzweig --- src/panfrost/midgard/disassemble.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c index 1c061eb6df7..be8c66fe2cc 100644 --- a/src/panfrost/midgard/disassemble.c +++ b/src/panfrost/midgard/disassemble.c @@ -1034,7 +1034,9 @@ print_load_store_instr(uint64_t data, int address = word->address; - if (OP_IS_UBO_READ(word->op)) { + bool is_ubo = OP_IS_UBO_READ(word->op); + + if (is_ubo) { /* UBOs use their own addressing scheme */ int lo = word->varying_parameters >> 7; @@ -1049,7 +1051,12 @@ print_load_store_instr(uint64_t data, print_swizzle_vec4(word->swizzle, false, false); printf(", "); - print_load_store_arg(word->arg_1, 0); + + if (is_ubo) + printf("ubo%d", word->arg_1); + else + print_load_store_arg(word->arg_1, 0); + printf(", "); print_load_store_arg(word->arg_2, 1); printf(" /* %X */\n", word->varying_parameters); -- 2.30.2