diff options
author | bunnei <bunneidev@gmail.com> | 2015-05-31 10:48:20 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-05-31 10:48:20 +0200 |
commit | 833936fc64d63cf3cfd6454c4be0d1f2f7445ffd (patch) | |
tree | 98f8740bfc89c2dfd4e430677befd003b53d0049 /src | |
parent | Merge pull request #822 from bunnei/pica-improvements (diff) | |
parent | Remove gpu_refresh_rate configuration option (diff) | |
download | yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar.gz yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar.bz2 yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar.lz yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar.xz yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.tar.zst yuzu-833936fc64d63cf3cfd6454c4be0d1f2f7445ffd.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/citra/config.cpp | 1 | ||||
-rw-r--r-- | src/citra_qt/config.cpp | 2 | ||||
-rw-r--r-- | src/core/hw/gpu.cpp | 5 | ||||
-rw-r--r-- | src/core/settings.h | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 846479fd7..1378567c1 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -66,7 +66,6 @@ void Config::ReadValues() { Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L); // Core - Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 30); Settings::values.frame_skip = glfw_config->GetInteger("Core", "frame_skip", 0); // Renderer diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index 460f4ec07..2a9af1f38 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -49,7 +49,6 @@ void Config::ReadValues() { qt_config->endGroup(); qt_config->beginGroup("Core"); - Settings::values.gpu_refresh_rate = qt_config->value("gpu_refresh_rate", 30).toInt(); Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt(); qt_config->endGroup(); @@ -102,7 +101,6 @@ void Config::SaveValues() { qt_config->endGroup(); qt_config->beginGroup("Core"); - qt_config->setValue("gpu_refresh_rate", Settings::values.gpu_refresh_rate); qt_config->setValue("frame_skip", Settings::values.frame_skip); qt_config->endGroup(); diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index ed607646e..789d3dda4 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 |