diff options
| author | Fernando S <fsahmkow27@gmail.com> | 2021-09-11 23:11:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 23:11:32 +0200 |
| commit | be4e1929033aff005472163164ab0ccc80d81c19 (patch) | |
| tree | b3b3f62a3b3e8e3c329ee35411d8d18e20a835ab /src/common/settings.h | |
| parent | 82c867164bc37d598f12fac5e8b662ee77b9db02 (diff) | |
| parent | b384129c63c604d8087f72a880adfdc6c68ab9a0 (diff) | |
Merge pull request #6846 from ameerj/nvdec-gpu-decode
nvdec: Add GPU video decoding for all capable drivers and platforms
Diffstat (limited to 'src/common/settings.h')
| -rw-r--r-- | src/common/settings.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/common/settings.h b/src/common/settings.h index ec4d381e8..b7195670b 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"}; |
