From 0c70101b74db61f883fdd7907a4975ffff735044 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 13 Nov 2019 04:08:23 +0100 Subject: 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 --- 3rdparty/bgfx/src/renderer.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to '3rdparty/bgfx/src/renderer.h') 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; -- cgit v1.2.3-70-g09d2