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

Resolved merge conflict.

Browse source
This commit is contained in:
bkaradzic 2013-02-20 22:20:37 -08:00
commit bbfc599684
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/renderer_gl.cpp
View file

@ -157,7 +157,8 @@ namespace bgfx
struct RendererContext struct RendererContext
{ {
RendererContext() RendererContext()
: m_capture(NULL) : m_rtMsaa(false)
, m_capture(NULL)
, m_captureSize(0) , m_captureSize(0)
, m_maxAnisotropy(0.0f) , m_maxAnisotropy(0.0f)
, m_maxMsaa(0) , m_maxMsaa(0)
@ -167,7 +168,6 @@ namespace bgfx
, m_flip(false) , m_flip(false)
, m_postSwapBuffers(NULL) , m_postSwapBuffers(NULL)
, m_hash( (BX_PLATFORM_WINDOWS<<1) | BX_ARCH_64BIT) , m_hash( (BX_PLATFORM_WINDOWS<<1) | BX_ARCH_64BIT)
, m_rtMsaa(false)
, m_backBufferFbo(0) , m_backBufferFbo(0)
{ {
m_rt.idx = invalidHandle; m_rt.idx = invalidHandle;