diff options
| author |  Fernando S | 2021-09-11 23:11:32 +0200 |
|---|---|---|
| committer |  GitHub | 2021-09-11 23:11:32 +0200 |
| commit | be4e1929033aff005472163164ab0ccc80d81c19 (patch) | |
| tree | b3b3f62a3b3e8e3c329ee35411d8d18e20a835ab /src/yuzu_cmd | |
| parent | Merge pull request #6901 from ameerj/vk-clear-bits (diff) | |
| parent | h264: Lower max_num_ref_frames (diff) | |
| download | yuzu-be4e1929033aff005472163164ab0ccc80d81c19.tar.gz yuzu-be4e1929033aff005472163164ab0ccc80d81c19.tar.xz yuzu-be4e1929033aff005472163164ab0ccc80d81c19.zip | |
Merge pull request #6846 from ameerj/nvdec-gpu-decode
nvdec: Add GPU video decoding for all capable drivers and platforms
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 757dd1ea0..891f7be6f 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -465,7 +465,7 @@ void Config::ReadValues() { | |||
| 465 | ReadSetting("Renderer", Settings::values.disable_fps_limit); | 465 | ReadSetting("Renderer", Settings::values.disable_fps_limit); |
| 466 | ReadSetting("Renderer", Settings::values.shader_backend); | 466 | ReadSetting("Renderer", Settings::values.shader_backend); |
| 467 | ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); | 467 | ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); |
| 468 | ReadSetting("Renderer", Settings::values.use_nvdec_emulation); | 468 | ReadSetting("Renderer", Settings::values.nvdec_emulation); |
| 469 | ReadSetting("Renderer", Settings::values.accelerate_astc); | 469 | ReadSetting("Renderer", Settings::values.accelerate_astc); |
| 470 | ReadSetting("Renderer", Settings::values.use_fast_gpu_time); | 470 | ReadSetting("Renderer", Settings::values.use_fast_gpu_time); |
| 471 | 471 | ||
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index e02eceb99..72f3213fb 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -261,9 +261,9 @@ shader_backend = | |||
| 261 | # 0 (default): Off, 1: On | 261 | # 0 (default): Off, 1: On |
| 262 | use_asynchronous_shaders = | 262 | use_asynchronous_shaders = |
| 263 | 263 | ||
| 264 | # Enable NVDEC emulation. | 264 | # NVDEC emulation. |
| 265 | # 0: Off, 1 (default): On | 265 | # 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding |
| 266 | use_nvdec_emulation = | 266 | nvdec_emulation = |
| 267 | 267 | ||
| 268 | # Accelerate ASTC texture decoding. | 268 | # Accelerate ASTC texture decoding. |
| 269 | # 0: Off, 1 (default): On | 269 | # 0: Off, 1 (default): On |