aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imgui/imconfig.h5
-rw-r--r--src/intel/tools/aubinator_viewer.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h
index 825505bf070..877eb819237 100644
--- a/src/imgui/imconfig.h
+++ b/src/imgui/imconfig.h
@@ -13,6 +13,11 @@
#pragma once
+// Have each embedded of ImGui define this symbol :
+struct ImGuiContext;
+extern thread_local ImGuiContext* __MesaImGui;
+#define GImGui __MesaImGui
+
//---- Define assertion handler. Defaults to calling assert().
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR)
//#define IM_ASSERT(_EXPR) ((void)(_EXPR)) // Disable asserts
diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index 4c11fe4b37d..0c9cb77d703 100644
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/src/intel/tools/aubinator_viewer.cpp
@@ -323,6 +323,8 @@ static struct Context {
struct window registers_window;
} context;
+thread_local ImGuiContext* __MesaImGui;
+
static int
map_key(int k)
{