diff options
author | bunnei <bunneidev@gmail.com> | 2016-09-01 04:20:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-01 04:20:54 +0200 |
commit | 09063dc5bb1e2b769c10077bf820a5300494c119 (patch) | |
tree | ad997ee86470e23e9dfa67a1d9824a57cdcf5571 /src/citra | |
parent | Merge pull request #2035 from MerryMage/disable-stretch (diff) | |
parent | qt: Rename all "toogle" to "toggle". (diff) | |
download | yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.gz yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.bz2 yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.lz yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.xz yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.zst yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.zip |
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/config.cpp | 1 | ||||
-rw-r--r-- | src/citra/default_ini.h | 4 | ||||
-rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index f48386b9c..110b883fb 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -71,6 +71,7 @@ void Config::ReadValues() { Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); Settings::values.use_scaled_resolution = sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false); + Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 5b8ca12a0..2031620a5 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -55,6 +55,10 @@ use_shader_jit = # 0 (default): Native, 1: Scaled use_scaled_resolution = +# Whether to enable V-Sync (caps the framerate at 60FPS) or not. +# 0 (default): Off, 1: On +use_vsync = + # The clear color for the renderer. What shows up on the sides of the bottom screen. # Must be in range of 0.0-1.0. Defaults to 1.0 for all. bg_red = diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 591f68aa4..da12307b7 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -108,6 +108,7 @@ EmuWindow_SDL2::EmuWindow_SDL2() { OnResize(); OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); SDL_PumpEvents(); + SDL_GL_SetSwapInterval(Settings::values.use_vsync); DoneCurrent(); } |