diff options
author | 2015-02-18 08:19:17 +0100 | |
---|---|---|
committer | 2015-02-18 08:19:17 +0100 | |
commit | 5618dda14676615935d28984a6c7bc5c3dfb42d9 (patch) | |
tree | dc508e8b62a5149141b870970e376bdf1fd43e12 /3rdparty/bgfx/examples/common/imgui/imgui.cpp | |
parent | b827e665e06bf5e68db6d2861f1de3166fe92288 (diff) |
Update of bx, bgfx, genie and mongoose (nw)
mongoose change should fix issue on XP
Diffstat (limited to '3rdparty/bgfx/examples/common/imgui/imgui.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/common/imgui/imgui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp index 805b60b0536..9e8039d3958 100644 --- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp +++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp @@ -468,9 +468,9 @@ struct Imgui IMGUI_create(_data, _size, _fontSize); m_nvg = nvgCreate(1, m_view); - nvgCreateFontMem(m_nvg, "default", (unsigned char*)_data, INT32_MAX, 0); - nvgFontSize(m_nvg, _fontSize); - nvgFontFace(m_nvg, "default"); + nvgCreateFontMem(m_nvg, "default", (unsigned char*)_data, INT32_MAX, 0); + nvgFontSize(m_nvg, _fontSize); + nvgFontFace(m_nvg, "default"); for (int32_t ii = 0; ii < NUM_CIRCLE_VERTS; ++ii) { @@ -518,6 +518,7 @@ struct Imgui break; case bgfx::RendererType::Direct3D11: + case bgfx::RendererType::Direct3D12: vs_imgui_color = bgfx::makeRef(vs_imgui_color_dx11, sizeof(vs_imgui_color_dx11) ); fs_imgui_color = bgfx::makeRef(fs_imgui_color_dx11, sizeof(fs_imgui_color_dx11) ); vs_imgui_texture = bgfx::makeRef(vs_imgui_texture_dx11, sizeof(vs_imgui_texture_dx11) ); |