diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2019-01-22 13:04:20 +0000 |
|---|---|---|
| committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2019-02-21 18:06:05 +0000 |
| commit | 89f03d187251fa46264218ccedb90e2ae2ea1d93 (patch) | |
| tree | 662eb63cb443d53ae98e9cc9761cbc5465b9df56 /src/imgui | |
| parent | 3950e7c11efc8682c0a141d17f30b97522e81af9 (diff) | |
| download | mesa-89f03d187251fa46264218ccedb90e2ae2ea1d93.tar.gz | |
imgui: make sure our copy of imgui doesn't clash with others in the same process
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
+1-by: Mike Lothian <mike@fireburn.co.uk>
+1-by: Tapani Pälli <tapani.palli@intel.com>
+1-by: Eric Engestrom <eric.engestrom@intel.com>
+1-by: Yurii Kolesnykov <root@yurikoles.com>
+1-by: myfreeweb <greg@unrelenting.technology>
+1-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/imgui')
| -rw-r--r-- | src/imgui/imconfig.h | 5 |
1 files changed, 5 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 |