Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-06-17 13:49:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

HW/GBACore: Remove the GBA "Threads" setting. Make GBAs always run on dedicated threads in preparation for future improvements.

Browse Source
This commit is contained in:
Jordan Woyak 2026-04-02 17:55:29 -05:00
parent e20f52ce7c
commit 26583fd026
8 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
View File

@ -145,7 +145,6 @@ enum class BooleanSetting(
"EnablePlayTimeTracking",
true
),
MAIN_GBA_THREADS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GBA, "Threads", true),
MAIN_EXPAND_TO_CUTOUT_AREA(
Settings.FILE_DOLPHIN,
Settings.SECTION_INI_INTERFACE,

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -704,14 +704,6 @@ class SettingsFragmentPresenter(
)
sl.add(HeaderSetting(context, R.string.gba_settings, 0))
sl.add(
SwitchSetting(
context,
BooleanSetting.MAIN_GBA_THREADS,
R.string.gba_threads,
0,
)
)
sl.add(
FilePicker(
context,

1
Source/Android/app/src/main/res/values/strings.xml
View File

@ -86,7 +86,6 @@
<string name="slot_b_device">GameCube Slot B Device</string>
<string name="serial_port_1_device">GameCube Serial Port 1 Device</string>
<string name="gba_settings">GBA Settings</string>
<string name="gba_threads">Run GBA Cores in Dedicated Threads</string>
<string name="gba_bios_path">BIOS</string>
<string name="gb_player_rom">Game Boy Player ROM</string>
<string name="gba_saves_path">Saves</string>

1
Source/Core/Core/Config/MainSettings.cpp
View File

@ -407,7 +407,6 @@ const std::array<Info<std::string>, 5> MAIN_GBA_ROM_PATHS{
};
const Info<std::string> MAIN_GBA_SAVES_PATH{{System::Main, "GBA", "SavesPath"}, ""};
const Info<bool> MAIN_GBA_SAVES_IN_ROM_PATH{{System::Main, "GBA", "SavesInRomPath"}, false};
const Info<bool> MAIN_GBA_THREADS{{System::Main, "GBA", "Threads"}, true};
#endif
// Main.Network

1
Source/Core/Core/Config/MainSettings.h
View File

@ -227,7 +227,6 @@ extern const Info<std::string> MAIN_GBA_BIOS_PATH;
extern const std::array<Info<std::string>, 5> MAIN_GBA_ROM_PATHS;
extern const Info<std::string> MAIN_GBA_SAVES_PATH;
extern const Info<bool> MAIN_GBA_SAVES_IN_ROM_PATH;
extern const Info<bool> MAIN_GBA_THREADS;
static constexpr std::size_t GBPLAYER_GBA_INDEX = 4;
#endif

13
Source/Core/Core/HW/GBACore.cpp
View File

@ -264,12 +264,8 @@ bool Core::Start(u64 gc_ticks)
// Notify the host and handle a dimension change if that happened after reset()
SetVideoBuffer();
if (Config::Get(Config::MAIN_GBA_THREADS))
{
m_event_thread.Reset(fmt::format("GBA{}", m_device_number + 1),
std::bind_front(&Core::HandleEvent, this));
}
m_event_thread.Reset(fmt::format("GBA{}", m_device_number + 1),
std::bind_front(&Core::HandleEvent, this));
return true;
}
@ -550,10 +546,7 @@ void Core::Flush()
void Core::PushEvent(SyncEvent event)
{
if (m_event_thread.IsRunning())
m_event_thread.Push(event);
else
HandleEvent(event);
m_event_thread.Push(event);
}
void Core::HandleEvent(SyncEvent event)

6
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -204,11 +204,6 @@ void GameCubePane::CreateWidgets()
gba_box->setLayout(gba_layout);
int gba_row = 0;
m_gba_threads =
new ConfigBool(tr("Run GBA Cores in Dedicated Threads"), Config::MAIN_GBA_THREADS);
gba_layout->addWidget(m_gba_threads, gba_row, 0, 1, -1);
gba_row++;
m_gba_bios_edit = new ConfigUserPath(F_GBABIOS_IDX, Config::MAIN_GBA_BIOS_PATH);
m_gba_browse_bios = new NonDefaultQPushButton(QStringLiteral("..."));
gba_layout->addWidget(new QLabel(tr("BIOS:")), gba_row, 0);
@ -307,7 +302,6 @@ void GameCubePane::OnEmulationStateChanged()
{
#ifdef HAS_LIBMGBA
bool gba_enabled = !NetPlay::IsNetPlayRunning();
m_gba_threads->setEnabled(gba_enabled);
m_gba_bios_edit->setEnabled(gba_enabled);
m_gba_browse_bios->setEnabled(gba_enabled);
m_gba_save_rom_path->setEnabled(gba_enabled);

1
Source/Core/DolphinQt/Settings/GameCubePane.h
View File

@ -81,7 +81,6 @@ private:
Common::EnumMap<QLabel*, ExpansionInterface::MAX_MEMCARD_SLOT> m_gci_override_labels;
Common::EnumMap<QLineEdit*, ExpansionInterface::MAX_MEMCARD_SLOT> m_gci_paths;
ConfigBool* m_gba_threads;
ConfigBool* m_gba_save_rom_path;
QPushButton* m_gba_browse_bios;
ConfigUserPath* m_gba_bios_edit;