diff options
| author | 2018-10-29 16:09:08 -0400 | |
|---|---|---|
| committer | 2018-10-29 16:09:08 -0400 | |
| commit | 48eb3742b9f84108538e2a41019aa9d5d47f7352 (patch) | |
| tree | 27b5ee039535f2357589052bc3021a8274ae47b3 | |
| parent | bis_factory: Add getter for mod dump root for a title ID (diff) | |
| download | yuzu-48eb3742b9f84108538e2a41019aa9d5d47f7352.tar.gz yuzu-48eb3742b9f84108538e2a41019aa9d5d47f7352.tar.xz yuzu-48eb3742b9f84108538e2a41019aa9d5d47f7352.zip | |
settings: Add setting to control NSO dumping
Also adds UI option in Debug > Dump section, with the idea later things to be dumped (i.e. other game data or textures, etc) will use the same group box.
Diffstat (limited to '')
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 21 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 2 |
6 files changed, 28 insertions, 1 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index b5aeff29b..0af9dd416 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -157,6 +157,7 @@ struct Values { | |||
| 157 | bool use_gdbstub; | 157 | bool use_gdbstub; |
| 158 | u16 gdbstub_port; | 158 | u16 gdbstub_port; |
| 159 | std::string program_args; | 159 | std::string program_args; |
| 160 | bool dump_nso; | ||
| 160 | 161 | ||
| 161 | // WebService | 162 | // WebService |
| 162 | bool enable_telemetry; | 163 | bool enable_telemetry; |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index d4fd60a73..b85011cd6 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -145,6 +145,7 @@ void Config::ReadValues() { | |||
| 145 | Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); | 145 | Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); |
| 146 | Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); | 146 | Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); |
| 147 | Settings::values.program_args = qt_config->value("program_args", "").toString().toStdString(); | 147 | Settings::values.program_args = qt_config->value("program_args", "").toString().toStdString(); |
| 148 | Settings::values.dump_nso = qt_config->value("dump_nso", false).toBool(); | ||
| 148 | qt_config->endGroup(); | 149 | qt_config->endGroup(); |
| 149 | 150 | ||
| 150 | qt_config->beginGroup("WebService"); | 151 | qt_config->beginGroup("WebService"); |
| @@ -283,6 +284,7 @@ void Config::SaveValues() { | |||
| 283 | qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); | 284 | qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); |
| 284 | qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); | 285 | qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); |
| 285 | qt_config->setValue("program_args", QString::fromStdString(Settings::values.program_args)); | 286 | qt_config->setValue("program_args", QString::fromStdString(Settings::values.program_args)); |
| 287 | qt_config->setValue("dump_nso", Settings::values.dump_nso); | ||
| 286 | qt_config->endGroup(); | 288 | qt_config->endGroup(); |
| 287 | 289 | ||
| 288 | qt_config->beginGroup("WebService"); | 290 | qt_config->beginGroup("WebService"); |
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 9e765fc93..fd5876b41 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp | |||
| @@ -34,6 +34,7 @@ void ConfigureDebug::setConfiguration() { | |||
| 34 | ui->toggle_console->setChecked(UISettings::values.show_console); | 34 | ui->toggle_console->setChecked(UISettings::values.show_console); |
| 35 | ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); | 35 | ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); |
| 36 | ui->homebrew_args_edit->setText(QString::fromStdString(Settings::values.program_args)); | 36 | ui->homebrew_args_edit->setText(QString::fromStdString(Settings::values.program_args)); |
| 37 | ui->dump_decompressed_nso->setChecked(Settings::values.dump_nso); | ||
| 37 | } | 38 | } |
| 38 | 39 | ||
| 39 | void ConfigureDebug::applyConfiguration() { | 40 | void ConfigureDebug::applyConfiguration() { |
| @@ -42,6 +43,7 @@ void ConfigureDebug::applyConfiguration() { | |||
| 42 | UISettings::values.show_console = ui->toggle_console->isChecked(); | 43 | UISettings::values.show_console = ui->toggle_console->isChecked(); |
| 43 | Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); | 44 | Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); |
| 44 | Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); | 45 | Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); |
| 46 | Settings::values.dump_nso = ui->dump_decompressed_nso->isChecked(); | ||
| 45 | Debugger::ToggleConsole(); | 47 | Debugger::ToggleConsole(); |
| 46 | Log::Filter filter; | 48 | Log::Filter filter; |
| 47 | filter.ParseFilterString(Settings::values.log_filter); | 49 | filter.ParseFilterString(Settings::values.log_filter); |
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index ff4987604..9c5b702f8 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <x>0</x> | 7 | <x>0</x> |
| 8 | <y>0</y> | 8 | <y>0</y> |
| 9 | <width>400</width> | 9 | <width>400</width> |
| 10 | <height>300</height> | 10 | <height>357</height> |
| 11 | </rect> | 11 | </rect> |
| 12 | </property> | 12 | </property> |
| 13 | <property name="windowTitle"> | 13 | <property name="windowTitle"> |
| @@ -130,6 +130,25 @@ | |||
| 130 | </widget> | 130 | </widget> |
| 131 | </item> | 131 | </item> |
| 132 | <item> | 132 | <item> |
| 133 | <widget class="QGroupBox" name="groupBox_4"> | ||
| 134 | <property name="title"> | ||
| 135 | <string>Dump</string> | ||
| 136 | </property> | ||
| 137 | <layout class="QVBoxLayout" name="verticalLayout_4"> | ||
| 138 | <item> | ||
| 139 | <widget class="QCheckBox" name="dump_decompressed_nso"> | ||
| 140 | <property name="whatsThis"> | ||
| 141 | <string>When checked, any NSO yuzu tries to load or patch will be copied decompressed to the yuzu/dump directory.</string> | ||
| 142 | </property> | ||
| 143 | <property name="text"> | ||
| 144 | <string>Dump Decompressed NSOs</string> | ||
| 145 | </property> | ||
| 146 | </widget> | ||
| 147 | </item> | ||
| 148 | </layout> | ||
| 149 | </widget> | ||
| 150 | </item> | ||
| 151 | <item> | ||
| 133 | <spacer name="verticalSpacer"> | 152 | <spacer name="verticalSpacer"> |
| 134 | <property name="orientation"> | 153 | <property name="orientation"> |
| 135 | <enum>Qt::Vertical</enum> | 154 | <enum>Qt::Vertical</enum> |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index b456266a6..f20b3a1b3 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -141,6 +141,7 @@ void Config::ReadValues() { | |||
| 141 | Settings::values.gdbstub_port = | 141 | Settings::values.gdbstub_port = |
| 142 | static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); | 142 | static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); |
| 143 | Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", ""); | 143 | Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", ""); |
| 144 | Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false); | ||
| 144 | 145 | ||
| 145 | // Web Service | 146 | // Web Service |
| 146 | Settings::values.enable_telemetry = | 147 | Settings::values.enable_telemetry = |
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index e0b223cd6..d83498358 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -201,6 +201,8 @@ log_filter = *:Trace | |||
| 201 | # Port for listening to GDB connections. | 201 | # Port for listening to GDB connections. |
| 202 | use_gdbstub=false | 202 | use_gdbstub=false |
| 203 | gdbstub_port=24689 | 203 | gdbstub_port=24689 |
| 204 | # Determines whether or not yuzu will dump all NSOs it attempts to load while loading them | ||
| 205 | dump_nso=false | ||
| 204 | 206 | ||
| 205 | [WebService] | 207 | [WebService] |
| 206 | # Whether or not to enable telemetry | 208 | # Whether or not to enable telemetry |