diff options
| author | 2021-11-21 16:57:00 +0100 | |
|---|---|---|
| committer | 2021-11-21 16:57:00 +0100 | |
| commit | 8e3371a5c5aa26e1f3d0c1f944b65ee6b65c3f34 (patch) | |
| tree | e68cbcdee5e9f9e1b484aad562825568e796d88b /src/common | |
| parent | Merge pull request #7395 from Morph1984/resolve-comments (diff) | |
| download | yuzu-8e3371a5c5aa26e1f3d0c1f944b65ee6b65c3f34.tar.gz yuzu-8e3371a5c5aa26e1f3d0c1f944b65ee6b65c3f34.tar.xz yuzu-8e3371a5c5aa26e1f3d0c1f944b65ee6b65c3f34.zip | |
configure_general: Allow framerate cap to be used in custom game configs
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 1 | ||||
| -rw-r--r-- | src/common/settings.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 3bcaa072f..6964a8273 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -183,6 +183,7 @@ void RestoreGlobalState(bool is_powered_on) { | |||
| 183 | values.max_anisotropy.SetGlobal(true); | 183 | values.max_anisotropy.SetGlobal(true); |
| 184 | values.use_speed_limit.SetGlobal(true); | 184 | values.use_speed_limit.SetGlobal(true); |
| 185 | values.speed_limit.SetGlobal(true); | 185 | values.speed_limit.SetGlobal(true); |
| 186 | values.fps_cap.SetGlobal(true); | ||
| 186 | values.use_disk_shader_cache.SetGlobal(true); | 187 | values.use_disk_shader_cache.SetGlobal(true); |
| 187 | values.gpu_accuracy.SetGlobal(true); | 188 | values.gpu_accuracy.SetGlobal(true); |
| 188 | values.use_asynchronous_gpu_emulation.SetGlobal(true); | 189 | values.use_asynchronous_gpu_emulation.SetGlobal(true); |
diff --git a/src/common/settings.h b/src/common/settings.h index 42f8b4a7d..fa4aa8747 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -525,7 +525,7 @@ struct Values { | |||
| 525 | Setting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; | 525 | Setting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; |
| 526 | Setting<bool> accelerate_astc{true, "accelerate_astc"}; | 526 | Setting<bool> accelerate_astc{true, "accelerate_astc"}; |
| 527 | Setting<bool> use_vsync{true, "use_vsync"}; | 527 | Setting<bool> use_vsync{true, "use_vsync"}; |
| 528 | BasicRangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"}; | 528 | RangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"}; |
| 529 | BasicSetting<bool> disable_fps_limit{false, "disable_fps_limit"}; | 529 | BasicSetting<bool> disable_fps_limit{false, "disable_fps_limit"}; |
| 530 | RangedSetting<ShaderBackend> shader_backend{ShaderBackend::GLASM, ShaderBackend::GLSL, | 530 | RangedSetting<ShaderBackend> shader_backend{ShaderBackend::GLASM, ShaderBackend::GLSL, |
| 531 | ShaderBackend::SPIRV, "shader_backend"}; | 531 | ShaderBackend::SPIRV, "shader_backend"}; |