summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2020-10-26 23:14:09 -0700
committerGravatar GitHub2020-10-26 23:14:09 -0700
commitcd92a94965a726a90032b15dbcc5ead877fac030 (patch)
tree83c372d19bfe813ddc7bb83f25aabb7dbddef419
parentMerge pull request #4729 from ameerj/nvdec-prod (diff)
parentyuzu: settings: Enable multicore, asynch GPU, and assembly shaders by default. (diff)
downloadyuzu-cd92a94965a726a90032b15dbcc5ead877fac030.tar.gz
yuzu-cd92a94965a726a90032b15dbcc5ead877fac030.tar.xz
yuzu-cd92a94965a726a90032b15dbcc5ead877fac030.zip
Merge pull request #4805 from bunnei/update-defaults
yuzu: settings: Enable multicore, asynch GPU, and assembly shaders by default.
-rw-r--r--src/yuzu/configuration/config.cpp12
-rw-r--r--src/yuzu_cmd/config.cpp6
-rw-r--r--src/yuzu_cmd/default_ini.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index abbc83929..1ce62e4a6 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -515,7 +515,7 @@ void Config::ReadMotionTouchValues() {
515void Config::ReadCoreValues() { 515void Config::ReadCoreValues() {
516 qt_config->beginGroup(QStringLiteral("Core")); 516 qt_config->beginGroup(QStringLiteral("Core"));
517 517
518 ReadSettingGlobal(Settings::values.use_multi_core, QStringLiteral("use_multi_core"), false); 518 ReadSettingGlobal(Settings::values.use_multi_core, QStringLiteral("use_multi_core"), true);
519 519
520 qt_config->endGroup(); 520 qt_config->endGroup();
521} 521}
@@ -716,12 +716,12 @@ void Config::ReadRendererValues() {
716 QStringLiteral("use_disk_shader_cache"), true); 716 QStringLiteral("use_disk_shader_cache"), true);
717 ReadSettingGlobal(Settings::values.gpu_accuracy, QStringLiteral("gpu_accuracy"), 0); 717 ReadSettingGlobal(Settings::values.gpu_accuracy, QStringLiteral("gpu_accuracy"), 0);
718 ReadSettingGlobal(Settings::values.use_asynchronous_gpu_emulation, 718 ReadSettingGlobal(Settings::values.use_asynchronous_gpu_emulation,
719 QStringLiteral("use_asynchronous_gpu_emulation"), false); 719 QStringLiteral("use_asynchronous_gpu_emulation"), true);
720 ReadSettingGlobal(Settings::values.use_nvdec_emulation, QStringLiteral("use_nvdec_emulation"), 720 ReadSettingGlobal(Settings::values.use_nvdec_emulation, QStringLiteral("use_nvdec_emulation"),
721 true); 721 true);
722 ReadSettingGlobal(Settings::values.use_vsync, QStringLiteral("use_vsync"), true); 722 ReadSettingGlobal(Settings::values.use_vsync, QStringLiteral("use_vsync"), true);
723 ReadSettingGlobal(Settings::values.use_assembly_shaders, QStringLiteral("use_assembly_shaders"), 723 ReadSettingGlobal(Settings::values.use_assembly_shaders, QStringLiteral("use_assembly_shaders"),
724 false); 724 true);
725 ReadSettingGlobal(Settings::values.use_asynchronous_shaders, 725 ReadSettingGlobal(Settings::values.use_asynchronous_shaders,
726 QStringLiteral("use_asynchronous_shaders"), false); 726 QStringLiteral("use_asynchronous_shaders"), false);
727 ReadSettingGlobal(Settings::values.use_fast_gpu_time, QStringLiteral("use_fast_gpu_time"), 727 ReadSettingGlobal(Settings::values.use_fast_gpu_time, QStringLiteral("use_fast_gpu_time"),
@@ -1110,7 +1110,7 @@ void Config::SaveControlValues() {
1110void Config::SaveCoreValues() { 1110void Config::SaveCoreValues() {
1111 qt_config->beginGroup(QStringLiteral("Core")); 1111 qt_config->beginGroup(QStringLiteral("Core"));
1112 1112
1113 WriteSettingGlobal(QStringLiteral("use_multi_core"), Settings::values.use_multi_core, false); 1113 WriteSettingGlobal(QStringLiteral("use_multi_core"), Settings::values.use_multi_core, true);
1114 1114
1115 qt_config->endGroup(); 1115 qt_config->endGroup();
1116} 1116}
@@ -1266,12 +1266,12 @@ void Config::SaveRendererValues() {
1266 static_cast<int>(Settings::values.gpu_accuracy.GetValue(global)), 1266 static_cast<int>(Settings::values.gpu_accuracy.GetValue(global)),
1267 Settings::values.gpu_accuracy.UsingGlobal(), 0); 1267 Settings::values.gpu_accuracy.UsingGlobal(), 0);
1268 WriteSettingGlobal(QStringLiteral("use_asynchronous_gpu_emulation"), 1268 WriteSettingGlobal(QStringLiteral("use_asynchronous_gpu_emulation"),
1269 Settings::values.use_asynchronous_gpu_emulation, false); 1269 Settings::values.use_asynchronous_gpu_emulation, true);
1270 WriteSettingGlobal(QStringLiteral("use_nvdec_emulation"), Settings::values.use_nvdec_emulation, 1270 WriteSettingGlobal(QStringLiteral("use_nvdec_emulation"), Settings::values.use_nvdec_emulation,
1271 true); 1271 true);
1272 WriteSettingGlobal(QStringLiteral("use_vsync"), Settings::values.use_vsync, true); 1272 WriteSettingGlobal(QStringLiteral("use_vsync"), Settings::values.use_vsync, true);
1273 WriteSettingGlobal(QStringLiteral("use_assembly_shaders"), 1273 WriteSettingGlobal(QStringLiteral("use_assembly_shaders"),
1274 Settings::values.use_assembly_shaders, false); 1274 Settings::values.use_assembly_shaders, true);
1275 WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"), 1275 WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"),
1276 Settings::values.use_asynchronous_shaders, false); 1276 Settings::values.use_asynchronous_shaders, false);
1277 WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time, 1277 WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time,
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 23448e747..334038ef9 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -371,7 +371,7 @@ void Config::ReadValues() {
371 371
372 // Core 372 // Core
373 Settings::values.use_multi_core.SetValue( 373 Settings::values.use_multi_core.SetValue(
374 sdl2_config->GetBoolean("Core", "use_multi_core", false)); 374 sdl2_config->GetBoolean("Core", "use_multi_core", true));
375 375
376 // Renderer 376 // Renderer
377 const int renderer_backend = sdl2_config->GetInteger( 377 const int renderer_backend = sdl2_config->GetInteger(
@@ -395,11 +395,11 @@ void Config::ReadValues() {
395 const int gpu_accuracy_level = sdl2_config->GetInteger("Renderer", "gpu_accuracy", 0); 395 const int gpu_accuracy_level = sdl2_config->GetInteger("Renderer", "gpu_accuracy", 0);
396 Settings::values.gpu_accuracy.SetValue(static_cast<Settings::GPUAccuracy>(gpu_accuracy_level)); 396 Settings::values.gpu_accuracy.SetValue(static_cast<Settings::GPUAccuracy>(gpu_accuracy_level));
397 Settings::values.use_asynchronous_gpu_emulation.SetValue( 397 Settings::values.use_asynchronous_gpu_emulation.SetValue(
398 sdl2_config->GetBoolean("Renderer", "use_asynchronous_gpu_emulation", false)); 398 sdl2_config->GetBoolean("Renderer", "use_asynchronous_gpu_emulation", true));
399 Settings::values.use_vsync.SetValue( 399 Settings::values.use_vsync.SetValue(
400 static_cast<u16>(sdl2_config->GetInteger("Renderer", "use_vsync", 1))); 400 static_cast<u16>(sdl2_config->GetInteger("Renderer", "use_vsync", 1)));
401 Settings::values.use_assembly_shaders.SetValue( 401 Settings::values.use_assembly_shaders.SetValue(
402 sdl2_config->GetBoolean("Renderer", "use_assembly_shaders", false)); 402 sdl2_config->GetBoolean("Renderer", "use_assembly_shaders", true));
403 Settings::values.use_asynchronous_shaders.SetValue( 403 Settings::values.use_asynchronous_shaders.SetValue(
404 sdl2_config->GetBoolean("Renderer", "use_asynchronous_shaders", false)); 404 sdl2_config->GetBoolean("Renderer", "use_asynchronous_shaders", false));
405 Settings::values.use_asynchronous_shaders.SetValue( 405 Settings::values.use_asynchronous_shaders.SetValue(
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index aa9e40380..796e27df4 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -94,7 +94,7 @@ udp_pad_index=
94 94
95[Core] 95[Core]
96# Whether to use multi-core for CPU emulation 96# Whether to use multi-core for CPU emulation
97# 0 (default): Disabled, 1: Enabled 97# 0: Disabled, 1 (default): Enabled
98use_multi_core= 98use_multi_core=
99 99
100[Cpu] 100[Cpu]
@@ -163,7 +163,7 @@ max_anisotropy =
163use_vsync = 163use_vsync =
164 164
165# Whether to use OpenGL assembly shaders or not. NV_gpu_program5 is required. 165# Whether to use OpenGL assembly shaders or not. NV_gpu_program5 is required.
166# 0 (default): Off, 1: On 166# 0: Off, 1 (default): On
167use_assembly_shaders = 167use_assembly_shaders =
168 168
169# Whether to allow asynchronous shader building. 169# Whether to allow asynchronous shader building.