summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h11
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() {
82 values.use_asynchronous_gpu_emulation.GetValue()); 82 values.use_asynchronous_gpu_emulation.GetValue());
83 log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); 83 log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue());
84 log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); 84 log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue());
85 log_setting("Renderer_AsyncASTC", values.async_astc.GetValue());
86 log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue()); 85 log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue());
87 log_setting("Renderer_UseVsync", values.vsync_mode.GetValue()); 86 log_setting("Renderer_UseVsync", values.vsync_mode.GetValue());
88 log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue()); 87 log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue());
@@ -246,7 +245,6 @@ void RestoreGlobalState(bool is_powered_on) {
246 values.use_asynchronous_gpu_emulation.SetGlobal(true); 245 values.use_asynchronous_gpu_emulation.SetGlobal(true);
247 values.nvdec_emulation.SetGlobal(true); 246 values.nvdec_emulation.SetGlobal(true);
248 values.accelerate_astc.SetGlobal(true); 247 values.accelerate_astc.SetGlobal(true);
249 values.async_astc.SetGlobal(true);
250 values.astc_recompression.SetGlobal(true); 248 values.astc_recompression.SetGlobal(true);
251 values.use_reactive_flushing.SetGlobal(true); 249 values.use_reactive_flushing.SetGlobal(true);
252 values.shader_backend.SetGlobal(true); 250 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 @@
16 16
17namespace Settings { 17namespace Settings {
18 18
19enum class AstcDecodeMode : u32 {
20 CPU = 0,
21 GPU = 1,
22 CPUAsynchronous = 2,
23};
24
19enum class VSyncMode : u32 { 25enum class VSyncMode : u32 {
20 Immediate = 0, 26 Immediate = 0,
21 Mailbox = 1, 27 Mailbox = 1,
@@ -467,8 +473,9 @@ struct Values {
467 GPUAccuracy::Extreme, "gpu_accuracy"}; 473 GPUAccuracy::Extreme, "gpu_accuracy"};
468 SwitchableSetting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"}; 474 SwitchableSetting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"};
469 SwitchableSetting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; 475 SwitchableSetting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"};
470 SwitchableSetting<bool> accelerate_astc{true, "accelerate_astc"}; 476 SwitchableSetting<AstcDecodeMode, true> accelerate_astc{
471 SwitchableSetting<bool> async_astc{false, "async_astc"}; 477 AstcDecodeMode::CPU, AstcDecodeMode::CPU, AstcDecodeMode::CPUAsynchronous,
478 "accelerate_astc"};
472 Setting<VSyncMode, true> vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, 479 Setting<VSyncMode, true> vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate,
473 VSyncMode::FIFORelaxed, "use_vsync"}; 480 VSyncMode::FIFORelaxed, "use_vsync"};
474 SwitchableSetting<bool> use_reactive_flushing{true, "use_reactive_flushing"}; 481 SwitchableSetting<bool> use_reactive_flushing{true, "use_reactive_flushing"};