diff options
Diffstat (limited to '')
| -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() { | |||
| 66 | Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L); | 66 | Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L); |
| 67 | 67 | ||
| 68 | // Core | 68 | // Core |
| 69 | Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 30); | ||
| 70 | Settings::values.frame_skip = glfw_config->GetInteger("Core", "frame_skip", 0); | 69 | Settings::values.frame_skip = glfw_config->GetInteger("Core", "frame_skip", 0); |
| 71 | 70 | ||
| 72 | // Renderer | 71 | // 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() { | |||
| 49 | qt_config->endGroup(); | 49 | qt_config->endGroup(); |
| 50 | 50 | ||
| 51 | qt_config->beginGroup("Core"); | 51 | qt_config->beginGroup("Core"); |
| 52 | Settings::values.gpu_refresh_rate = qt_config->value("gpu_refresh_rate", 30).toInt(); | ||
| 53 | Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt(); | 52 | Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt(); |
| 54 | qt_config->endGroup(); | 53 | qt_config->endGroup(); |
| 55 | 54 | ||
| @@ -102,7 +101,6 @@ void Config::SaveValues() { | |||
| 102 | qt_config->endGroup(); | 101 | qt_config->endGroup(); |
| 103 | 102 | ||
| 104 | qt_config->beginGroup("Core"); | 103 | qt_config->beginGroup("Core"); |
| 105 | qt_config->setValue("gpu_refresh_rate", Settings::values.gpu_refresh_rate); | ||
| 106 | qt_config->setValue("frame_skip", Settings::values.frame_skip); | 104 | qt_config->setValue("frame_skip", Settings::values.frame_skip); |
| 107 | qt_config->endGroup(); | 105 | qt_config->endGroup(); |
| 108 | 106 | ||
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; | |||
| 30 | 30 | ||
| 31 | /// True if the current frame was skipped | 31 | /// True if the current frame was skipped |
| 32 | bool g_skip_frame; | 32 | bool g_skip_frame; |
| 33 | /// 268MHz / gpu_refresh_rate frames per second | 33 | /// 268MHz CPU clocks / 60Hz frames per second |
| 34 | static u64 frame_ticks; | 34 | const u64 frame_ticks = 268123480ull / 60; |
| 35 | /// Event id for CoreTiming | 35 | /// Event id for CoreTiming |
| 36 | static int vblank_event; | 36 | static int vblank_event; |
| 37 | /// Total number of frames drawn | 37 | /// Total number of frames drawn |
| @@ -357,7 +357,6 @@ void Init() { | |||
| 357 | framebuffer_sub.color_format = Regs::PixelFormat::RGB8; | 357 | framebuffer_sub.color_format = Regs::PixelFormat::RGB8; |
| 358 | framebuffer_sub.active_fb = 0; | 358 | framebuffer_sub.active_fb = 0; |
| 359 | 359 | ||
| 360 | frame_ticks = 268123480 / Settings::values.gpu_refresh_rate; | ||
| 361 | last_skip_frame = false; | 360 | last_skip_frame = false; |
| 362 | g_skip_frame = false; | 361 | g_skip_frame = false; |
| 363 | frame_count = 0; | 362 | 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 { | |||
| 35 | int pad_cright_key; | 35 | int pad_cright_key; |
| 36 | 36 | ||
| 37 | // Core | 37 | // Core |
| 38 | int gpu_refresh_rate; | ||
| 39 | int frame_skip; | 38 | int frame_skip; |
| 40 | 39 | ||
| 41 | // Data Storage | 40 | // Data Storage |