From a25c6b0649730132e8a16f0be34bb6d1bfc93ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Wed, 20 Feb 2019 17:20:59 -0800 Subject: [PATCH] Cleanup. --- src/renderer_d3d12.cpp | 10 +++++++--- src/renderer_d3d9.cpp | 12 ++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 77aa4c23b..3ffaf46d5 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -5887,16 +5887,20 @@ namespace bgfx { namespace d3d12 currentProgram = BGFX_INVALID_HANDLE; hasPredefined = false; - fbh = _render->m_view[view].m_fbh; - setFrameBuffer(fbh); - if (item > 1) { profiler.end(); } + BGFX_D3D12_PROFILER_END(); + setViewType(view, " "); + BGFX_D3D12_PROFILER_BEGIN(view, kColorView); + profiler.begin(view); + fbh = _render->m_view[view].m_fbh; + setFrameBuffer(fbh); + viewState.m_rect = _render->m_view[view].m_rect; const Rect& rect = _render->m_view[view].m_rect; const Rect& scissorRect = _render->m_view[view].m_scissor; diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 68f4dc5be..4d38fcd1a 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -3858,12 +3858,6 @@ namespace bgfx { namespace d3d9 view = key.m_view; currentProgram = BGFX_INVALID_HANDLE; - if (_render->m_view[view].m_fbh.idx != fbh.idx) - { - fbh = _render->m_view[view].m_fbh; - setFrameBuffer(fbh); - } - if (item > 0) { profiler.end(); @@ -3874,6 +3868,12 @@ namespace bgfx { namespace d3d9 profiler.begin(view); + if (_render->m_view[view].m_fbh.idx != fbh.idx) + { + fbh = _render->m_view[view].m_fbh; + setFrameBuffer(fbh); + } + viewState.m_rect = _render->m_view[view].m_rect; const Rect& scissorRect = _render->m_view[view].m_scissor; viewHasScissor = !scissorRect.isZero();