Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / intel / tools / aubinator_viewer.cpp

diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index 140cde5bbbce56023fd0a89d1571170fdccaac44..6369b817a0c20d08ddb8c85713ebf6fc77161635 100644 (file)
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/src/intel/tools/aubinator_viewer.cpp
@@ -63,7 +63,6 @@ struct aub_file {
    /* Device state */
    struct gen_device_info devinfo;
    struct gen_spec *spec;
-   struct gen_disasm *disasm;
 };
 
 static void
@@ -131,7 +130,6 @@ handle_info(void *user_data, int pci_id, const char *app_name)
       exit(EXIT_FAILURE);
    }
    file->spec = gen_spec_load(&file->devinfo);
-   file->disasm = gen_disasm_create(&file->devinfo);
 }
 
 static void
@@ -394,9 +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,
-                                (const uint8_t *) shader_bo.map +
-                                (address - shader_bo.addr), 0, f);
+         gen_disassemble(&context.file->devinfo,
+                         (const uint8_t *) shader_bo.map +
+                         (address - shader_bo.addr), 0, f);
          fclose(f);
       }
    }
@@ -818,8 +816,8 @@ new_batch_window(int exec_idx)
    aub_viewer_decode_ctx_init(&window->decode_ctx,
                               &context.cfg,
                               &window->decode_cfg,
+                              &context.file->devinfo,
                               context.file->spec,
-                              context.file->disasm,
                               batch_get_bo,
                               NULL,
                               window);
@@ -1085,7 +1083,7 @@ display_windows(void)
          window->destroy(window);
    }
 
-   list_for_each_entry(struct window, window, &context.windows, link) {
+   list_for_each_entry_safe(struct window, window, &context.windows, link) {
       ImGui::SetNextWindowPos(window->position, ImGuiCond_FirstUseEver);
       ImGui::SetNextWindowSize(window->size, ImGuiCond_FirstUseEver);
       if (ImGui::Begin(window->name, &window->opened)) {