From 08777e2c0ec82a98e94caa0240c6a4558500be2d Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 15 Apr 2018 20:59:41 +0200 Subject: [PATCH] [dxvk] Change stat couter type to uint64_t --- src/dxvk/dxvk_stats.h | 8 ++++---- src/dxvk/hud/dxvk_hud_stats.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dxvk/dxvk_stats.h b/src/dxvk/dxvk_stats.h index b4b9f4ce..e0342841 100644 --- a/src/dxvk/dxvk_stats.h +++ b/src/dxvk/dxvk_stats.h @@ -44,7 +44,7 @@ namespace dxvk { * \param [in] ctr The counter * \returns Counter value */ - uint32_t getCtr(DxvkStatCounter ctr) const { + uint64_t getCtr(DxvkStatCounter ctr) const { return m_counters[uint32_t(ctr)]; } @@ -54,7 +54,7 @@ namespace dxvk { * \param [in] ctr The counter * \param [in] val Counter value */ - void setCtr(DxvkStatCounter ctr, uint32_t val) { + void setCtr(DxvkStatCounter ctr, uint64_t val) { m_counters[uint32_t(ctr)] = val; } @@ -64,7 +64,7 @@ namespace dxvk { * \param [in] ctr Counter to increment * \param [in] val Number to add to counter value */ - void addCtr(DxvkStatCounter ctr, uint32_t val) { + void addCtr(DxvkStatCounter ctr, uint64_t val) { m_counters[uint32_t(ctr)] += val; } @@ -103,7 +103,7 @@ namespace dxvk { private: - std::array m_counters; + std::array m_counters; }; diff --git a/src/dxvk/hud/dxvk_hud_stats.cpp b/src/dxvk/hud/dxvk_hud_stats.cpp index f9c9e646..5e8b1bbb 100644 --- a/src/dxvk/hud/dxvk_hud_stats.cpp +++ b/src/dxvk/hud/dxvk_hud_stats.cpp @@ -47,7 +47,7 @@ namespace dxvk::hud { const Rc& context, HudTextRenderer& renderer, HudPos position) { - const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1u); + const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1ull); const uint64_t gpCalls = m_diffCounters.getCtr(DxvkStatCounter::CmdDrawCalls) / frameCount; const uint64_t cpCalls = m_diffCounters.getCtr(DxvkStatCounter::CmdDispatchCalls) / frameCount; @@ -80,7 +80,7 @@ namespace dxvk::hud { const Rc& context, HudTextRenderer& renderer, HudPos position) { - const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1u); + const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1ull); const uint64_t numSubmits = m_diffCounters.getCtr(DxvkStatCounter::QueueSubmitCount) / frameCount; const std::string strSubmissions = str::format("Queue submissions: ", numSubmits);