scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #295 from mmicko/master

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/common/imgui/imgui.cpp
View file

@ -3188,10 +3188,10 @@ struct Imgui
NVGcontext* m_nvg; NVGcontext* m_nvg;
uint8_t m_view; uint8_t m_view;
uint16_t m_viewWidth;
uint16_t m_viewHeight;
uint16_t m_surfaceWidth; uint16_t m_surfaceWidth;
uint16_t m_surfaceHeight; uint16_t m_surfaceHeight;
uint16_t m_viewWidth;
uint16_t m_viewHeight;
#if !USE_NANOVG_FONT #if !USE_NANOVG_FONT
struct Font struct Font

2
src/renderer_gl.cpp
View file

@ -3921,7 +3921,7 @@ namespace bgfx
&& bx::findIdentifierMatch(code, s_ARB_shader_texture_lod) && 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); uint32_t version = usesIUsamplers ? 130 : (usesTextureLod ? 120 : 0);