diff options
| author | 2017-01-08 12:25:12 -0500 | |
|---|---|---|
| committer | 2017-01-08 12:25:12 -0500 | |
| commit | 9fc8ead8424a1e9fa46ab9b15777416b256a77d1 (patch) | |
| tree | 3757cf233b6b57155c287c7f968cad5e41761a05 /src/core | |
| parent | Merge pull request #1951 from wwylele/motion-sensor (diff) | |
| parent | config: Add option for specifying screen resolution scale factor. (diff) | |
| download | yuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.tar.gz yuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.tar.xz yuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.zip | |
Merge pull request #2384 from bunnei/internal-res-option
config: Add option for specifying screen resolution scale factor.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/settings.cpp | 1 | ||||
| -rw-r--r-- | src/core/settings.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 5d23c52f9..9afaf79ec 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -20,7 +20,6 @@ void Apply() { | |||
| 20 | 20 | ||
| 21 | VideoCore::g_hw_renderer_enabled = values.use_hw_renderer; | 21 | VideoCore::g_hw_renderer_enabled = values.use_hw_renderer; |
| 22 | VideoCore::g_shader_jit_enabled = values.use_shader_jit; | 22 | VideoCore::g_shader_jit_enabled = values.use_shader_jit; |
| 23 | VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution; | ||
| 24 | VideoCore::g_toggle_framelimit_enabled = values.toggle_framelimit; | 23 | VideoCore::g_toggle_framelimit_enabled = values.toggle_framelimit; |
| 25 | 24 | ||
| 26 | if (VideoCore::g_emu_window) { | 25 | if (VideoCore::g_emu_window) { |
diff --git a/src/core/settings.h b/src/core/settings.h index 4e7a4b1be..8dbda653a 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -88,7 +88,7 @@ struct Values { | |||
| 88 | // Renderer | 88 | // Renderer |
| 89 | bool use_hw_renderer; | 89 | bool use_hw_renderer; |
| 90 | bool use_shader_jit; | 90 | bool use_shader_jit; |
| 91 | bool use_scaled_resolution; | 91 | float resolution_factor; |
| 92 | bool use_vsync; | 92 | bool use_vsync; |
| 93 | bool toggle_framelimit; | 93 | bool toggle_framelimit; |
| 94 | 94 | ||