From 70e65ee63a08c4f0716872a45faffade0e18e369 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 11 Jan 2018 22:41:32 -0700 Subject: Remove settings issues in sdl and fix a few files that broke in mingw --- src/core/hle/service/service.cpp | 2 -- src/core/perf_stats.cpp | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/core') 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 @@ #include "core/hle/service/am/am.h" #include "core/hle/service/aoc/aoc_u.h" #include "core/hle/service/apm/apm.h" -#include "core/hle/service/dsp_dsp.h" -#include "core/hle/service/gsp_gpu.h" #include "core/hle/service/hid/hid.h" #include "core/hle/service/lm/lm.h" #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 @@ #include #include #include "common/math_util.h" -#include "core/hw/gpu.h" #include "core/perf_stats.h" #include "core/settings.h" @@ -70,7 +69,7 @@ PerfStats::Results PerfStats::GetAndResetStats(u64 current_system_time_us) { double PerfStats::GetLastFrameTimeScale() { std::lock_guard lock(object_mutex); - constexpr double FRAME_LENGTH = 1.0 / GPU::SCREEN_REFRESH_RATE; + constexpr double FRAME_LENGTH = 1.0 / 60; // GPU::SCREEN_REFRESH_RATE; return duration_cast(previous_frame_length).count() / FRAME_LENGTH; } -- cgit v1.2.3