summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/renderer.h
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-11-13 04:08:23 +0100
committer R. Belmont <rb6502@users.noreply.github.com>2019-11-12 22:08:23 -0500
commit0c70101b74db61f883fdd7907a4975ffff735044 (patch)
tree067ae1c831088d6853b6f443e5a05a4c5d8cd7aa /3rdparty/bgfx/src/renderer.h
parentc089bea7011de9ca78f43979d902978a113d33e2 (diff)
Sync bgfx, bx and bimg with upstream; fix the hlsl fs_chroma.sc matrix transposition properly (#5875)
* Sync bgfx with upstream revision 280420d * Sync bx with upstream revision 267727d * Sync bimg with upstream revision c1bab10 * Use bgfx helper functions to ensure correct matrix orientation * Rebuild hlsl chain
Diffstat (limited to '3rdparty/bgfx/src/renderer.h')
-rw-r--r--3rdparty/bgfx/src/renderer.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/3rdparty/bgfx/src/renderer.h b/3rdparty/bgfx/src/renderer.h
index 025c6f7e927..ff298d80cc1 100644
--- a/3rdparty/bgfx/src/renderer.h
+++ b/3rdparty/bgfx/src/renderer.h
@@ -499,7 +499,7 @@ namespace bgfx
if (m_enabled)
{
ViewStats& viewStats = m_frame->m_perfStats.viewStats[m_numViews];
- viewStats.cpuTimeElapsed = -bx::getHPCounter();
+ viewStats.cpuTimeBegin = bx::getHPCounter();
m_queryIdx = m_gpuTimer.begin(_view);
@@ -521,8 +521,9 @@ namespace bgfx
ViewStats& viewStats = m_frame->m_perfStats.viewStats[m_numViews];
const typename Ty::Result& result = m_gpuTimer.m_result[viewStats.view];
- viewStats.cpuTimeElapsed += bx::getHPCounter();
- viewStats.gpuTimeElapsed = result.m_end - result.m_begin;
+ viewStats.cpuTimeEnd = bx::getHPCounter();
+ viewStats.gpuTimeBegin = result.m_begin;
+ viewStats.gpuTimeEnd = result.m_end;
++m_numViews;
m_queryIdx = UINT32_MAX;