diff options
| author | 2020-06-16 14:12:17 -0400 | |
|---|---|---|
| committer | 2020-06-16 14:12:17 -0400 | |
| commit | f22d02083c0ec7627673c9ae021463e2ab8f07bd (patch) | |
| tree | c50714fa1aa25fc7a367539547bacd47fe73a605 /src/yuzu_cmd | |
| parent | Merge pull request #4091 from MerryMage/cmakelists-xbyak-order (diff) | |
| parent | yuzu/frontend: Remove internal resolution option (diff) | |
| download | yuzu-f22d02083c0ec7627673c9ae021463e2ab8f07bd.tar.gz yuzu-f22d02083c0ec7627673c9ae021463e2ab8f07bd.tar.xz yuzu-f22d02083c0ec7627673c9ae021463e2ab8f07bd.zip | |
Merge pull request #3966 from Morph1984/hide-internal-resolution-ui
yuzu/frontend: Remove internal resolution option
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 7240270f5..659b9f701 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -380,8 +380,6 @@ void Config::ReadValues() { | |||
| 380 | Settings::values.renderer_debug = sdl2_config->GetBoolean("Renderer", "debug", false); | 380 | Settings::values.renderer_debug = sdl2_config->GetBoolean("Renderer", "debug", false); |
| 381 | Settings::values.vulkan_device = sdl2_config->GetInteger("Renderer", "vulkan_device", 0); | 381 | Settings::values.vulkan_device = sdl2_config->GetInteger("Renderer", "vulkan_device", 0); |
| 382 | 382 | ||
| 383 | Settings::values.resolution_factor = | ||
| 384 | static_cast<float>(sdl2_config->GetReal("Renderer", "resolution_factor", 1.0)); | ||
| 385 | Settings::values.aspect_ratio = | 383 | Settings::values.aspect_ratio = |
| 386 | static_cast<int>(sdl2_config->GetInteger("Renderer", "aspect_ratio", 0)); | 384 | static_cast<int>(sdl2_config->GetInteger("Renderer", "aspect_ratio", 0)); |
| 387 | Settings::values.max_anisotropy = | 385 | Settings::values.max_anisotropy = |
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 6f53e9659..45c07ed5d 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -117,11 +117,6 @@ use_hw_renderer = | |||
| 117 | # 0: Interpreter (slow), 1 (default): JIT (fast) | 117 | # 0: Interpreter (slow), 1 (default): JIT (fast) |
| 118 | use_shader_jit = | 118 | use_shader_jit = |
| 119 | 119 | ||
| 120 | # Resolution scale factor | ||
| 121 | # 0: Auto (scales resolution to window size), 1: Native Switch screen resolution, Otherwise a scale | ||
| 122 | # factor for the Switch resolution | ||
| 123 | resolution_factor = | ||
| 124 | |||
| 125 | # Aspect ratio | 120 | # Aspect ratio |
| 126 | # 0: Default (16:9), 1: Force 4:3, 2: Force 21:9, 3: Stretch to Window | 121 | # 0: Default (16:9), 1: Force 4:3, 2: Force 21:9, 3: Stretch to Window |
| 127 | aspect_ratio = | 122 | aspect_ratio = |