Moved internal view state into single struct.

This commit is contained in:
Branimir Karadžić
2017-10-30 08:39:25 -07:00
parent 8eced7c113
commit 85322904a9
8 changed files with 182 additions and 131 deletions

View File

@@ -6627,7 +6627,7 @@ namespace bgfx { namespace gl
bool viewRestart = false;
uint8_t restartState = 0;
viewState.m_rect = _render->m_rect[0];
viewState.m_rect = _render->m_view[0].m_rect;
int32_t numItems = _render->m_numRenderItems;
for (int32_t item = 0, restartItem = numItems; item < numItems || restartItem < numItems;)
@@ -6660,9 +6660,9 @@ namespace bgfx { namespace gl
view = key.m_view;
programIdx = kInvalidHandle;
if (_render->m_fb[view].idx != fbh.idx)
if (_render->m_view[view].m_fbh.idx != fbh.idx)
{
fbh = _render->m_fb[view];
fbh = _render->m_view[view].m_fbh;
resolutionHeight = hmdEnabled
? _render->m_hmd.height
: _render->m_resolution.m_height
@@ -6670,7 +6670,7 @@ namespace bgfx { namespace gl
resolutionHeight = setFrameBuffer(fbh, resolutionHeight, discardFlags);
}
viewRestart = ( (BGFX_VIEW_STEREO == (_render->m_viewFlags[view] & BGFX_VIEW_STEREO) ) );
viewRestart = ( (BGFX_VIEW_STEREO == (_render->m_view[view].m_flags & BGFX_VIEW_STEREO) ) );
viewRestart &= hmdEnabled;
if (viewRestart)
{
@@ -6695,7 +6695,7 @@ namespace bgfx { namespace gl
profiler.begin(view);
viewState.m_rect = _render->m_rect[view];
viewState.m_rect = _render->m_view[view].m_rect;
if (viewRestart)
{
if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) )
@@ -6727,7 +6727,7 @@ namespace bgfx { namespace gl
}
}
const Rect& scissorRect = _render->m_scissor[view];
const Rect& scissorRect = _render->m_view[view].m_scissor;
viewHasScissor = !scissorRect.isZero();
viewScissorRect = viewHasScissor ? scissorRect : viewState.m_rect;
@@ -6737,7 +6737,7 @@ namespace bgfx { namespace gl
, viewState.m_rect.m_height
) );
Clear& clear = _render->m_clear[view];
Clear& clear = _render->m_view[view].m_clear;
discardFlags = clear.m_flags & BGFX_CLEAR_DISCARD_MASK;
if (BGFX_CLEAR_NONE != (clear.m_flags & BGFX_CLEAR_MASK) )