summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/imgui/imgui.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-09-08 05:14:35 +1000
committer Vas Crabb <vas@vastheman.com>2023-09-08 05:14:35 +1000
commit44eb5ea3c69dcec37e2b687e479297af5303efc3 (patch)
tree2784753bdf56564ce3b4cf0f410bf07709854fdd /3rdparty/bgfx/examples/common/imgui/imgui.cpp
parent1147d8fc44c701ed0235e9374f97d218fae37b32 (diff)
Revert "Updated bgfx, bx and bimg to current upstream versions. (#11493)"
This reverts commit 1c61ccfe840cdae7a9f92292946a45f3b47e2412.
Diffstat (limited to '3rdparty/bgfx/examples/common/imgui/imgui.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/imgui/imgui.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
index da932cb7111..951c118ed76 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
@@ -188,8 +188,6 @@ struct OcornutImguiContext
void create(float _fontSize, bx::AllocatorI* _allocator)
{
- IMGUI_CHECKVERSION();
-
m_allocator = _allocator;
if (NULL == _allocator)
@@ -509,13 +507,13 @@ static OcornutImguiContext s_ctx;
static void* memAlloc(size_t _size, void* _userData)
{
BX_UNUSED(_userData);
- return bx::alloc(s_ctx.m_allocator, _size);
+ return BX_ALLOC(s_ctx.m_allocator, _size);
}
static void memFree(void* _ptr, void* _userData)
{
BX_UNUSED(_userData);
- bx::free(s_ctx.m_allocator, _ptr);
+ BX_FREE(s_ctx.m_allocator, _ptr);
}
void imguiCreate(float _fontSize, bx::AllocatorI* _allocator)