Mesa (master): intel/aub_viewer: fix shader view

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7ab8c8062510ef1b3f01bef0e3b16c60ea311857
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ab8c8062510ef1b3f01bef0e3b16c60ea311857

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Dec 19 17:52:06 2018 +0000

intel/aub_viewer: fix shader view

Not decoding the shader at the right offset.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/intel/tools/aubinator_viewer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index 47eba274da..fe93615438 100644
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/src/intel/tools/aubinator_viewer.cpp
@@ -392,7 +392,9 @@ new_shader_window(struct aub_mem *mem, uint64_t address, const char *desc)
    if (shader_bo.map) {
       FILE *f = open_memstream(&window->shader, &window->shader_size);
       if (f) {
-         gen_disasm_disassemble(context.file->disasm, shader_bo.map, 0, f);
+         gen_disasm_disassemble(context.file->disasm,
+                                (const uint8_t *) shader_bo.map +
+                                (address - shader_bo.addr), 0, f);
          fclose(f);
       }
    }