Merge pull request #295 from mmicko/master

Reorder warning fix
This commit is contained in:
Branimir Karadžić 2015-03-17 08:33:38 -07:00
commit 05b8f6c0e3
2 changed files with 3 additions and 3 deletions

View file

@ -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

View file

@ -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);