summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar bunnei2016-12-29 23:28:27 -0500
committerGravatar bunnei2017-01-07 03:23:22 -0500
commit22ad9094e6355e84f2e45abcd66748b2c74dfaf9 (patch)
tree1124bc25253f2c4f6adc7ec9a90aa9a3d2213ba6 /src/citra
parentMerge pull request #2410 from Subv/sleepthread (diff)
downloadyuzu-22ad9094e6355e84f2e45abcd66748b2c74dfaf9.tar.gz
yuzu-22ad9094e6355e84f2e45abcd66748b2c74dfaf9.tar.xz
yuzu-22ad9094e6355e84f2e45abcd66748b2c74dfaf9.zip
config: Add option for specifying screen resolution scale factor.
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp3
-rw-r--r--src/citra/default_ini.h7
2 files changed, 5 insertions, 5 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 98f093258..bd8ac563b 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -63,8 +63,7 @@ void Config::ReadValues() {
63 // Renderer 63 // Renderer
64 Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); 64 Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true);
65 Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); 65 Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true);
66 Settings::values.use_scaled_resolution = 66 Settings::values.resolution_factor = sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
67 sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false);
68 Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); 67 Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false);
69 Settings::values.toggle_framelimit = 68 Settings::values.toggle_framelimit =
70 sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true); 69 sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true);
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index bb4720d25..7996813b4 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -51,9 +51,10 @@ use_hw_renderer =
51# 0: Interpreter (slow), 1 (default): JIT (fast) 51# 0: Interpreter (slow), 1 (default): JIT (fast)
52use_shader_jit = 52use_shader_jit =
53 53
54# Whether to use native 3DS screen resolution or to scale rendering resolution to the displayed screen size. 54# Resolution scale factor
55# 0 (default): Native, 1: Scaled 55# 0: Auto (scales resolution to window size), 1: Native 3DS screen resolution, Otherwise a scale
56use_scaled_resolution = 56# factor for the 3DS resolution
57resolution_factor =
57 58
58# Whether to enable V-Sync (caps the framerate at 60FPS) or not. 59# Whether to enable V-Sync (caps the framerate at 60FPS) or not.
59# 0 (default): Off, 1: On 60# 0 (default): Off, 1: On