citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #832 from yuriks/refresh-rate-option 

Remove gpu_refresh_rate configuration option
This commit is contained in:
bunnei 2015-05-31 04:48:20 -04:00
parent 8852fc6a87 d65b42a69a
commit 833936fc64
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra/config.cpp
View File

@ -66,7 +66,6 @@ void Config::ReadValues() {
Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L); Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L);
// Core // 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); Settings::values.frame_skip = glfw_config->GetInteger("Core", "frame_skip", 0);
// Renderer // Renderer

2
src/citra_qt/config.cpp
View File

@ -49,7 +49,6 @@ void Config::ReadValues() {
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); 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(); Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt();
qt_config->endGroup(); qt_config->endGroup();
@ -102,7 +101,6 @@ void Config::SaveValues() {
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); 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->setValue("frame_skip", Settings::values.frame_skip);
qt_config->endGroup(); qt_config->endGroup();

5
src/core/hw/gpu.cpp
View File

@ -30,8 +30,8 @@ Regs g_regs;
/// True if the current frame was skipped /// True if the current frame was skipped
bool g_skip_frame; bool g_skip_frame;
/// 268MHz / gpu_refresh_rate frames per second /// 268MHz CPU clocks / 60Hz frames per second
static u64 frame_ticks; const u64 frame_ticks = 268123480ull / 60;
/// Event id for CoreTiming /// Event id for CoreTiming
static int vblank_event; static int vblank_event;
/// Total number of frames drawn /// Total number of frames drawn
@ -357,7 +357,6 @@ void Init() {
framebuffer_sub.color_format = Regs::PixelFormat::RGB8; framebuffer_sub.color_format = Regs::PixelFormat::RGB8;
framebuffer_sub.active_fb = 0; framebuffer_sub.active_fb = 0;
frame_ticks = 268123480 / Settings::values.gpu_refresh_rate;
last_skip_frame = false; last_skip_frame = false;
g_skip_frame = false; g_skip_frame = false;
frame_count = 0; frame_count = 0;

1
src/core/settings.h
View File

@ -35,7 +35,6 @@ struct Values {
int pad_cright_key; int pad_cright_key;
// Core // Core
int gpu_refresh_rate;
int frame_skip; int frame_skip;
// Data Storage // Data Storage