From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 13 Aug 2019 18:10:06 +0000 (-0700)
Subject: pan/midgard: Disassemble UBO index explicitly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e823a47f0213907957feb6a30fa664d35901ae96;p=mesa.git

pan/midgard: Disassemble UBO index explicitly

It's a bit of a special case but that's fine.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

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);