diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-08 22:56:40 +0200 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-16 20:40:53 +0200 |
commit | cd016d3cb5191b9f4f2756e440a6aa67e577c414 (patch) | |
tree | e96e08167a350f05feb9c081950be305612d9113 /src/common | |
parent | codec: Improve libav memory alloc and cleanup (diff) | |
download | yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar.gz yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar.bz2 yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar.lz yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar.xz yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.tar.zst yuzu-cd016d3cb5191b9f4f2756e440a6aa67e577c414.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/settings.cpp | 4 | ||||
-rw-r--r-- | src/common/settings.h | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 996315999..33665eab8 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -54,7 +54,7 @@ void LogSettings() { log_setting("Renderer_GPUAccuracyLevel", values.gpu_accuracy.GetValue()); log_setting("Renderer_UseAsynchronousGpuEmulation", values.use_asynchronous_gpu_emulation.GetValue()); - log_setting("Renderer_UseNvdecEmulation", values.use_nvdec_emulation.GetValue()); + log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); log_setting("Renderer_UseVsync", values.use_vsync.GetValue()); log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue()); @@ -137,7 +137,7 @@ void RestoreGlobalState(bool is_powered_on) { values.use_disk_shader_cache.SetGlobal(true); values.gpu_accuracy.SetGlobal(true); values.use_asynchronous_gpu_emulation.SetGlobal(true); - values.use_nvdec_emulation.SetGlobal(true); + values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); values.use_vsync.SetGlobal(true); values.shader_backend.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 1ba9b606c..28074c1b9 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -48,6 +48,12 @@ enum class FullscreenMode : u32 { Exclusive = 1, }; +enum class NvdecEmulation : u32 { + Off = 0, + CPU = 1, + GPU = 2, +}; + /** The BasicSetting class is a simple resource manager. It defines a label and default value * alongside the actual value of the setting for simpler and less-error prone use with frontend * configurations. Setting a default value and label is required, though subclasses may deviate from @@ -466,7 +472,7 @@ struct Values { RangedSetting<GPUAccuracy> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal, GPUAccuracy::Extreme, "gpu_accuracy"}; Setting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"}; - Setting<bool> use_nvdec_emulation{true, "use_nvdec_emulation"}; + Setting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; Setting<bool> accelerate_astc{true, "accelerate_astc"}; Setting<bool> use_vsync{true, "use_vsync"}; BasicRangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"}; |