eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

[setting] Removed enable_low_memory (we need to put in a diferrent PR) 

This reverts commit e09759fa0d.
pull/3246/head
Caio Oliveira 3 weeks ago
committed by crueter
parent
252fc2f1bc
commit
cb0c1e9f97
4 changed files with 76 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/common/settings.h
  2. 6
      src/video_core/texture_cache/texture_cache.h
  3. 2
      src/yuzu/configuration/configure_debug.cpp
  4. 148
      src/yuzu/configuration/configure_debug.ui

1
src/common/settings.h
View File

@ -756,7 +756,6 @@ struct Values {
Setting<std::string> log_filter{linkage, "*:Info", "log_filter", Category::Miscellaneous}; Setting<std::string> log_filter{linkage, "*:Info", "log_filter", Category::Miscellaneous};
Setting<bool> log_flush_line{linkage, false, "flush_line", Category::Miscellaneous, Specialization::Default, true, true}; Setting<bool> log_flush_line{linkage, false, "flush_line", Category::Miscellaneous, Specialization::Default, true, true};
Setting<bool> censor_username{linkage, true, "censor_username", Category::Miscellaneous}; Setting<bool> censor_username{linkage, true, "censor_username", Category::Miscellaneous};
Setting<bool> enable_low_memory{linkage, true, "enable_low_memory", Category::Miscellaneous};
Setting<bool> first_launch{linkage, true, "first_launch", Category::Miscellaneous}; Setting<bool> first_launch{linkage, true, "first_launch", Category::Miscellaneous};
// Network // Network

6
src/video_core/texture_cache/texture_cache.h
View File

@ -70,13 +70,15 @@ TextureCache<P>::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag
(std::max)((std::min)(device_local_memory - min_vacancy_critical, min_spacing_critical), (std::max)((std::min)(device_local_memory - min_vacancy_critical, min_spacing_critical),
DEFAULT_CRITICAL_MEMORY)); DEFAULT_CRITICAL_MEMORY));
minimum_memory = static_cast<u64>((device_local_memory - mem_threshold) / 2); minimum_memory = static_cast<u64>((device_local_memory - mem_threshold) / 2);
lowmemorydevice = false;
} else { } else {
expected_memory = DEFAULT_EXPECTED_MEMORY + 512_MiB; expected_memory = DEFAULT_EXPECTED_MEMORY + 512_MiB;
critical_memory = DEFAULT_CRITICAL_MEMORY + 1_GiB; critical_memory = DEFAULT_CRITICAL_MEMORY + 1_GiB;
minimum_memory = 0; minimum_memory = 0;
}
lowmemorydevice = Settings::values.enable_low_memory.GetValue();
lowmemorydevice = true;
}
switch (Settings::values.gpu_unzwizzle_texture_size.GetValue()) { switch (Settings::values.gpu_unzwizzle_texture_size.GetValue()) {
case Settings::GpuUnswizzleSize::VerySmall: gpu_unswizzle_maxsize = 16_MiB; break; case Settings::GpuUnswizzleSize::VerySmall: gpu_unswizzle_maxsize = 16_MiB; break;

2
src/yuzu/configuration/configure_debug.cpp
View File

@ -42,7 +42,6 @@ void ConfigureDebug::SetConfiguration() {
ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue())); ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue()));
ui->flush_line->setChecked(Settings::values.log_flush_line.GetValue()); ui->flush_line->setChecked(Settings::values.log_flush_line.GetValue());
ui->censor_username->setChecked(Settings::values.censor_username.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->reporting_services->setChecked(Settings::values.reporting_services.GetValue());
ui->dump_audio_commands->setChecked(Settings::values.dump_audio_commands.GetValue()); ui->dump_audio_commands->setChecked(Settings::values.dump_audio_commands.GetValue());
ui->quest_flag->setChecked(Settings::values.quest_flag.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_filter = ui->log_filter_edit->text().toStdString();
Settings::values.log_flush_line = ui->flush_line->isChecked(); Settings::values.log_flush_line = ui->flush_line->isChecked();
Settings::values.censor_username = ui->censor_username->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.program_args = ui->homebrew_args_edit->text().toStdString();
Settings::values.enable_fs_access_log = ui->fs_access_log->isChecked(); Settings::values.enable_fs_access_log = ui->fs_access_log->isChecked();
Settings::values.reporting_services = ui->reporting_services->isChecked(); Settings::values.reporting_services = ui->reporting_services->isChecked();

148
src/yuzu/configuration/configure_debug.ui
View File

@ -467,72 +467,7 @@
<string>Debugging</string> <string>Debugging</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0">
<widget class="QCheckBox" name="flush_line">
<property name="text">
<string>Flush log output on each line</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="dump_audio_commands">
<property name="toolTip">
<string>Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer.</string>
</property>
<property name="text">
<string>Dump Audio Commands To Console**</string>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="9" column="0">
<widget class="QSpinBox" name="debug_knobs_spinbox">
<property name="toolTip">
<string>Bitmask for quick development toggles</string>
</property>
<property name="statusTip">
<string>Set debug knobs (bitmask)</string>
</property>
<property name="whatsThis">
<string>16-bit debug knob set for quick development toggles</string>
</property>
<property name="suffix">
<string> (bitmask)</string>
</property>
<property name="prefix">
<string>Debug Knobs: </string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="fs_access_log">
<property name="text">
<string>Enable FS Access Log</string>
</property>
</widget>
</item>
<item row="7" column="0">
<item row="6" column="0">
<widget class="QWidget" name="serial_battery_widget" native="true"> <widget class="QWidget" name="serial_battery_widget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -572,14 +507,32 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QCheckBox" name="reporting_services">
<property name="text">
<string>Enable Verbose Reporting Services**</string>
<item row="8" column="0">
<widget class="QSpinBox" name="debug_knobs_spinbox">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="toolTip">
<string>Bitmask for quick development toggles</string>
</property>
<property name="statusTip">
<string>Set debug knobs (bitmask)</string>
</property>
<property name="whatsThis">
<string>16-bit debug knob set for quick development toggles</string>
</property>
<property name="suffix">
<string> (bitmask)</string>
</property>
<property name="prefix">
<string>Debug Knobs: </string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0">
<item row="7" column="0">
<widget class="QWidget" name="serial_board_widget" native="true"> <widget class="QWidget" name="serial_board_widget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -619,20 +572,57 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QCheckBox" name="censor_username">
<item row="0" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="dump_audio_commands">
<property name="toolTip">
<string>Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer.</string>
</property>
<property name="text"> <property name="text">
<string>Censor username in logs</string>
<string>Dump Audio Commands To Console**</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QCheckBox" name="enable_low_memory">
<property name="toolTip">
<string>When checked, emulates a device with limited memory. Current use case is to ignore 256mb or larger sparse textures using BC1 format</string>
<item row="2" column="0">
<widget class="QCheckBox" name="flush_line">
<property name="text">
<string>Flush log output on each line</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="fs_access_log">
<property name="text">
<string>Enable FS Access Log</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="reporting_services">
<property name="text">
<string>Enable Verbose Reporting Services**</string>
</property> </property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="censor_username">
<property name="text"> <property name="text">
<string>Enable Low Memory Device</string>
<string>Censor username in logs</string>
</property> </property>
</widget> </widget>
</item> </item>

Write Preview
Loading…
Cancel
Save