imgui: make sure our copy of imgui doesn't clash with others in the same process

Signed-off-by: Lionel Landwerlin <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
+1-by: Mike Lothian <[email protected]>
+1-by: Tapani Pälli <[email protected]>
+1-by: Eric Engestrom <[email protected]>
+1-by: Yurii Kolesnykov <[email protected]>
+1-by: myfreeweb <[email protected]>
+1-by: Kenneth Graunke <[email protected]>

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