summaryrefslogtreecommitdiff
path: root/src/common/profiler.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-21 11:29:48 -0700
committerGravatar GitHub2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/common/profiler.cpp
parentREADME: Specify master branch for Travis CI badge (diff)
parentFix Travis clang-format check (diff)
downloadyuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/common/profiler.cpp')
-rw-r--r--src/common/profiler.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp
index 49eb3f40c..b40e7205d 100644
--- a/src/common/profiler.cpp
+++ b/src/common/profiler.cpp
@@ -5,7 +5,6 @@
5#include <algorithm> 5#include <algorithm>
6#include <cstddef> 6#include <cstddef>
7#include <vector> 7#include <vector>
8
9#include "common/assert.h" 8#include "common/assert.h"
10#include "common/profiler_reporting.h" 9#include "common/profiler_reporting.h"
11#include "common/synchronized_wrapper.h" 10#include "common/synchronized_wrapper.h"
@@ -14,8 +13,7 @@ namespace Common {
14namespace Profiling { 13namespace Profiling {
15 14
16ProfilingManager::ProfilingManager() 15ProfilingManager::ProfilingManager()
17 : last_frame_end(Clock::now()), this_frame_start(Clock::now()) { 16 : last_frame_end(Clock::now()), this_frame_start(Clock::now()) {}
18}
19 17
20void ProfilingManager::BeginFrame() { 18void ProfilingManager::BeginFrame() {
21 this_frame_start = Clock::now(); 19 this_frame_start = Clock::now();
@@ -31,7 +29,7 @@ void ProfilingManager::FinishFrame() {
31} 29}
32 30
33TimingResultsAggregator::TimingResultsAggregator(size_t window_size) 31TimingResultsAggregator::TimingResultsAggregator(size_t window_size)
34 : max_window_size(window_size), window_size(0) { 32 : max_window_size(window_size), window_size(0) {
35 interframe_times.resize(window_size, Duration::zero()); 33 interframe_times.resize(window_size, Duration::zero());
36 frame_times.resize(window_size, Duration::zero()); 34 frame_times.resize(window_size, Duration::zero());
37} 35}