diff options
| author | 2016-08-25 18:20:47 -0400 | |
|---|---|---|
| committer | 2016-08-29 21:42:30 -0400 | |
| commit | 08ad9b36d44e3cca0802bb1198036c5d77c844cc (patch) | |
| tree | 8bbca77978c74081557adf548ec65e624ae3ccfd /src/citra | |
| parent | qt: Add a configuration tab for Graphics and move relevant fields. (diff) | |
| download | yuzu-08ad9b36d44e3cca0802bb1198036c5d77c844cc.tar.gz yuzu-08ad9b36d44e3cca0802bb1198036c5d77c844cc.tar.xz yuzu-08ad9b36d44e3cca0802bb1198036c5d77c844cc.zip | |
config: Add a setting for graphics V-Sync.
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 e832ec58d..d71045646 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -71,6 +71,7 @@ void Config::ReadValues() { | |||
| 71 | Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); | 71 | Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); |
| 72 | Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); | 72 | Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); |
| 73 | Settings::values.use_scaled_resolution = sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false); | 73 | Settings::values.use_scaled_resolution = sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false); |
| 74 | Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); | ||
| 74 | 75 | ||
| 75 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); | 76 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); |
| 76 | Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); | 77 | 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 6249ef9e2..b10700e62 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h | |||
| @@ -55,6 +55,10 @@ use_shader_jit = | |||
| 55 | # 0 (default): Native, 1: Scaled | 55 | # 0 (default): Native, 1: Scaled |
| 56 | use_scaled_resolution = | 56 | use_scaled_resolution = |
| 57 | 57 | ||
| 58 | # Whether to enable V-Sync (caps the framerate at 60FPS) or not. | ||
| 59 | # 0 (default): Off, 1: On | ||
| 60 | use_vsync = | ||
| 61 | |||
| 58 | # The clear color for the renderer. What shows up on the sides of the bottom screen. | 62 | # The clear color for the renderer. What shows up on the sides of the bottom screen. |
| 59 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. | 63 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. |
| 60 | bg_red = | 64 | 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() { | |||
| 108 | OnResize(); | 108 | OnResize(); |
| 109 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); | 109 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); |
| 110 | SDL_PumpEvents(); | 110 | SDL_PumpEvents(); |
| 111 | SDL_GL_SetSwapInterval(Settings::values.use_vsync); | ||
| 111 | 112 | ||
| 112 | DoneCurrent(); | 113 | DoneCurrent(); |
| 113 | } | 114 | } |