diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-05-04 02:42:33 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-21 16:56:07 +0200 |
commit | 5cffa342884df531d911555f7b3db9d2f6d1d1f0 (patch) | |
tree | 7f1d36c9f291a528edf9ccf7e85f34d2d108b332 /src/common | |
parent | Merge pull request #11096 from german77/amiibooo (diff) | |
download | yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar.gz yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar.bz2 yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar.lz yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar.xz yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.tar.zst yuzu-5cffa342884df531d911555f7b3db9d2f6d1d1f0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/settings.cpp | 2 | ||||
-rw-r--r-- | src/common/settings.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 5972480e5..3f56afe94 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -82,7 +82,6 @@ void LogSettings() { values.use_asynchronous_gpu_emulation.GetValue()); log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); - log_setting("Renderer_AsyncASTC", values.async_astc.GetValue()); log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue()); log_setting("Renderer_UseVsync", values.vsync_mode.GetValue()); log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue()); @@ -246,7 +245,6 @@ void RestoreGlobalState(bool is_powered_on) { values.use_asynchronous_gpu_emulation.SetGlobal(true); values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); - values.async_astc.SetGlobal(true); values.astc_recompression.SetGlobal(true); values.use_reactive_flushing.SetGlobal(true); values.shader_backend.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 59e96e74f..b8ab34f7f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -16,6 +16,12 @@ namespace Settings { +enum class AstcDecodeMode : u32 { + CPU = 0, + GPU = 1, + CPUAsynchronous = 2, +}; + enum class VSyncMode : u32 { Immediate = 0, Mailbox = 1, @@ -467,8 +473,9 @@ struct Values { GPUAccuracy::Extreme, "gpu_accuracy"}; SwitchableSetting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"}; SwitchableSetting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; - SwitchableSetting<bool> accelerate_astc{true, "accelerate_astc"}; - SwitchableSetting<bool> async_astc{false, "async_astc"}; + SwitchableSetting<AstcDecodeMode, true> accelerate_astc{ + AstcDecodeMode::CPU, AstcDecodeMode::CPU, AstcDecodeMode::CPUAsynchronous, + "accelerate_astc"}; Setting<VSyncMode, true> vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, VSyncMode::FIFORelaxed, "use_vsync"}; SwitchableSetting<bool> use_reactive_flushing{true, "use_reactive_flushing"}; |