r600/sb: Correct SB disassambler for better debugging

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Konstantin Kharlamov <hi-angel@yandex.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3286>

diff --git a/src/gallium/drivers/r600/sb/sb_bc_dump.cpp b/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
index 9b2674daf27d59089503af483d6d58043db2461d..de3c38805b8088d578a600fa79566131f070fea3 100644 (file)
--- a/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
@@ -157,6 +157,8 @@ void bc_dump::dump(cf_node& n) {
 
                s << "  ES:" << n.bc.elem_size;
 
+      s << " OP:" << n.bc.rat_inst;
+
                if (n.bc.mark)
                        s << " MARK";
 

diff --git a/src/gallium/drivers/r600/sb/sb_dump.cpp b/src/gallium/drivers/r600/sb/sb_dump.cpp
index 70892e1c8c4fd6703f30a76ed10b9f0cc5e17fd2..57dded5ef0029fc1d7f660a1d36b1f0a4dc6c42e 100644 (file)
--- a/src/gallium/drivers/r600/sb/sb_dump.cpp
+++ b/src/gallium/drivers/r600/sb/sb_dump.cpp
@@ -367,7 +367,12 @@ void dump::dump_op(node &n, const char *name) {
                sblog << ",       ";
        }
 
-       dump_vec(n.src);
+   if (n.subtype == NST_FETCH_INST) {
+      fetch_node *f = static_cast<fetch_node*>(&n);
+      if (f->bc.indexed)
+         dump_vec(n.src);
+   } else
+      dump_vec(n.src);
 }
 
 void dump::dump_set(shader &sh, val_set& v) {