summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2019-01-22 13:04:20 +0000
committerLionel Landwerlin <[email protected]>2019-02-21 18:06:05 +0000
commit89f03d187251fa46264218ccedb90e2ae2ea1d93 (patch)
tree662eb63cb443d53ae98e9cc9761cbc5465b9df56 /src/intel
parent3950e7c11efc8682c0a141d17f30b97522e81af9 (diff)
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]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/tools/aubinator_viewer.cpp2
1 files changed, 2 insertions, 0 deletions
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)
{