diff --git a/src/common/settings.h b/src/common/settings.h index 38b35f7a8f..0053f37ea9 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -756,7 +756,6 @@ struct Values { Setting log_filter{linkage, "*:Info", "log_filter", Category::Miscellaneous}; Setting log_flush_line{linkage, false, "flush_line", Category::Miscellaneous, Specialization::Default, true, true}; Setting censor_username{linkage, true, "censor_username", Category::Miscellaneous}; - Setting enable_low_memory{linkage, true, "enable_low_memory", Category::Miscellaneous}; Setting first_launch{linkage, true, "first_launch", Category::Miscellaneous}; // Network diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 8b432c4c97..c71d990ea6 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -70,13 +70,15 @@ TextureCache

::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag (std::max)((std::min)(device_local_memory - min_vacancy_critical, min_spacing_critical), DEFAULT_CRITICAL_MEMORY)); minimum_memory = static_cast((device_local_memory - mem_threshold) / 2); + + lowmemorydevice = false; } else { expected_memory = DEFAULT_EXPECTED_MEMORY + 512_MiB; critical_memory = DEFAULT_CRITICAL_MEMORY + 1_GiB; minimum_memory = 0; - } - lowmemorydevice = Settings::values.enable_low_memory.GetValue(); + lowmemorydevice = true; + } switch (Settings::values.gpu_unzwizzle_texture_size.GetValue()) { case Settings::GpuUnswizzleSize::VerySmall: gpu_unswizzle_maxsize = 16_MiB; break; diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 6c4081edc5..0de5f46dcc 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -42,7 +42,6 @@ void ConfigureDebug::SetConfiguration() { ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue())); ui->flush_line->setChecked(Settings::values.log_flush_line.GetValue()); ui->censor_username->setChecked(Settings::values.censor_username.GetValue()); - ui->enable_low_memory->setChecked(Settings::values.enable_low_memory.GetValue()); ui->reporting_services->setChecked(Settings::values.reporting_services.GetValue()); ui->dump_audio_commands->setChecked(Settings::values.dump_audio_commands.GetValue()); ui->quest_flag->setChecked(Settings::values.quest_flag.GetValue()); @@ -105,7 +104,6 @@ void ConfigureDebug::ApplyConfiguration() { Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); Settings::values.log_flush_line = ui->flush_line->isChecked(); Settings::values.censor_username = ui->censor_username->isChecked(); - Settings::values.enable_low_memory = ui->enable_low_memory->isChecked(); Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); Settings::values.enable_fs_access_log = ui->fs_access_log->isChecked(); Settings::values.reporting_services = ui->reporting_services->isChecked(); diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 6095516574..1b1423b62c 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui @@ -467,72 +467,7 @@ Debugging - - - - Flush log output on each line - - - - - - - Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - - - Dump Audio Commands To Console** - - - - - - - Qt::Orientation::Vertical - - - QSizePolicy::Policy::Expanding - - - - 20 - 0 - - - - - - - - Bitmask for quick development toggles - - - Set debug knobs (bitmask) - - - 16-bit debug knob set for quick development toggles - - - (bitmask) - - - Debug Knobs: - - - 0 - - - 65535 - - - - - - - Enable FS Access Log - - - - + @@ -572,14 +507,32 @@ - - - - Enable Verbose Reporting Services** - - - - + + + + 0 + + + 65535 + + + Bitmask for quick development toggles + + + Set debug knobs (bitmask) + + + 16-bit debug knob set for quick development toggles + + + (bitmask) + + + Debug Knobs: + + + + @@ -619,20 +572,57 @@ - - + + + + Qt::Orientation::Vertical + + + QSizePolicy::Policy::Expanding + + + + 20 + 0 + + + + + + + + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. + - Censor username in logs + Dump Audio Commands To Console** - - - - When checked, emulates a device with limited memory. Current use case is to ignore 256mb or larger sparse textures using BC1 format + + + + Flush log output on each line + + + + + + + Enable FS Access Log + + + + + + + Enable Verbose Reporting Services** + + + + - Enable Low Memory Device + Censor username in logs