summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-30 00:17:51 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-30 00:39:26 +0200
commitd65b42a69abbde2130c77917e7db5722799a6896 (patch)
tree12b4c12f8711185125c155d2c86d2e0c162ec7de /src/core
parentMerge pull request #817 from linkmauve/citra.ico (diff)
downloadyuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar.gz
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar.bz2
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar.lz
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar.xz
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.tar.zst
yuzu-d65b42a69abbde2130c77917e7db5722799a6896.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hw/gpu.cpp5
-rw-r--r--src/core/settings.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index ddc5d647e..99cfdaafc 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -30,8 +30,8 @@ Regs g_regs;
/// True if the current frame was skipped
bool g_skip_frame;
-/// 268MHz / gpu_refresh_rate frames per second
-static u64 frame_ticks;
+/// 268MHz CPU clocks / 60Hz frames per second
+const u64 frame_ticks = 268123480ull / 60;
/// Event id for CoreTiming
static int vblank_event;
/// Total number of frames drawn
@@ -357,7 +357,6 @@ void Init() {
framebuffer_sub.color_format = Regs::PixelFormat::RGB8;
framebuffer_sub.active_fb = 0;
- frame_ticks = 268123480 / Settings::values.gpu_refresh_rate;
last_skip_frame = false;
g_skip_frame = false;
frame_count = 0;
diff --git a/src/core/settings.h b/src/core/settings.h
index 54c1023b8..5a70d157a 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -35,7 +35,6 @@ struct Values {
int pad_cright_key;
// Core
- int gpu_refresh_rate;
int frame_skip;
// Data Storage