summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar James Rowe2018-01-11 22:41:32 -0700
committerGravatar James Rowe2018-01-12 19:11:05 -0700
commit70e65ee63a08c4f0716872a45faffade0e18e369 (patch)
tree78f1ec5e39992cf581ca328027b7c8c8259e1bb9 /src/core
parentRemoving unused settings and yuzu rebranding (diff)
downloadyuzu-70e65ee63a08c4f0716872a45faffade0e18e369.tar.gz
yuzu-70e65ee63a08c4f0716872a45faffade0e18e369.tar.xz
yuzu-70e65ee63a08c4f0716872a45faffade0e18e369.zip
Remove settings issues in sdl and fix a few files that broke in mingw
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/service.cpp2
-rw-r--r--src/core/perf_stats.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 389243035..d2265227f 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -17,8 +17,6 @@
17#include "core/hle/service/am/am.h" 17#include "core/hle/service/am/am.h"
18#include "core/hle/service/aoc/aoc_u.h" 18#include "core/hle/service/aoc/aoc_u.h"
19#include "core/hle/service/apm/apm.h" 19#include "core/hle/service/apm/apm.h"
20#include "core/hle/service/dsp_dsp.h"
21#include "core/hle/service/gsp_gpu.h"
22#include "core/hle/service/hid/hid.h" 20#include "core/hle/service/hid/hid.h"
23#include "core/hle/service/lm/lm.h" 21#include "core/hle/service/lm/lm.h"
24#include "core/hle/service/nvdrv/nvdrv.h" 22#include "core/hle/service/nvdrv/nvdrv.h"
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index 2cdfb9ded..26752699e 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -6,7 +6,6 @@
6#include <mutex> 6#include <mutex>
7#include <thread> 7#include <thread>
8#include "common/math_util.h" 8#include "common/math_util.h"
9#include "core/hw/gpu.h"
10#include "core/perf_stats.h" 9#include "core/perf_stats.h"
11#include "core/settings.h" 10#include "core/settings.h"
12 11
@@ -70,7 +69,7 @@ PerfStats::Results PerfStats::GetAndResetStats(u64 current_system_time_us) {
70double PerfStats::GetLastFrameTimeScale() { 69double PerfStats::GetLastFrameTimeScale() {
71 std::lock_guard<std::mutex> lock(object_mutex); 70 std::lock_guard<std::mutex> lock(object_mutex);
72 71
73 constexpr double FRAME_LENGTH = 1.0 / GPU::SCREEN_REFRESH_RATE; 72 constexpr double FRAME_LENGTH = 1.0 / 60; // GPU::SCREEN_REFRESH_RATE;
74 return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH; 73 return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH;
75} 74}
76 75