Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-18 13:03:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into encoder

Browse Source
This commit is contained in:
Branimir Karadžić
2017-11-02 19:02:46 -07:00
parent 3575355ea5 c81caf1949
commit cf8d9819df
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderer_gl.cpp
View File

@@ -6902,11 +6902,9 @@ namespace bgfx { namespace gl
const uint64_t newFlags = draw.m_stateFlags;
uint64_t changedFlags = currentState.m_stateFlags ^ draw.m_stateFlags;
currentState.m_stateFlags = newFlags;
const uint64_t newStencil = draw.m_stencil;
uint64_t changedStencil = currentState.m_stencil ^ draw.m_stencil;
currentState.m_stencil = newStencil;
if (resetState)
{
@@ -6914,8 +6912,6 @@ namespace bgfx { namespace gl
currentState.m_scissor = !draw.m_scissor;
changedFlags = BGFX_STATE_MASK;
changedStencil = packStencil(BGFX_STENCIL_MASK, BGFX_STENCIL_MASK);
currentState.m_stateFlags = newFlags;
currentState.m_stencil = newStencil;
currentBind.clear();
}
@@ -6947,7 +6943,7 @@ namespace bgfx { namespace gl
scissorRect.setIntersect(viewScissorRect, _render->m_frameCache.m_rectCache.m_cache[scissor]);
if (scissorRect.isZeroArea() )
{
//continue;
continue;
}
GL_CHECK(glEnable(GL_SCISSOR_TEST) );
@@ -6959,6 +6955,9 @@ namespace bgfx { namespace gl
}
}
currentState.m_stateFlags = newFlags;
currentState.m_stencil = newStencil;
if (0 != changedStencil)
{
if (0 != newStencil)