From 5b0fea005225ac37efeb798415f25ad04d076486 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 17 Mar 2015 11:28:30 +0100 Subject: [PATCH 1/2] Reorder warning fix --- examples/common/imgui/imgui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index 00e0bc67..646d13b0 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -3188,10 +3188,10 @@ struct Imgui NVGcontext* m_nvg; uint8_t m_view; - uint16_t m_viewWidth; - uint16_t m_viewHeight; uint16_t m_surfaceWidth; uint16_t m_surfaceHeight; + uint16_t m_viewWidth; + uint16_t m_viewHeight; #if !USE_NANOVG_FONT struct Font From 161d5a475e05db841bcf5965b0af6d6ca417dab9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 17 Mar 2015 14:18:27 +0100 Subject: [PATCH 2/2] Fix VisualStudio warning --- src/renderer_gl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index ff59a739..8285bfde 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -3921,7 +3921,7 @@ namespace bgfx && bx::findIdentifierMatch(code, s_ARB_shader_texture_lod) ; - bool usesIUsamplers = bx::findIdentifierMatch(code, s_uisamplers); + bool usesIUsamplers = !!bx::findIdentifierMatch(code, s_uisamplers); uint32_t version = usesIUsamplers ? 130 : (usesTextureLod ? 120 : 0);