mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-07 10:22:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core/PowerPC: Return AvailableCPUCores() as a std::span.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2023-08-16 19:15:22 +02:00
parent 51f807b63a
commit a34f221782
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -236,9 +236,9 @@ void PowerPCManager::InitializeCPUCore(CPUCore cpu_core)
m_mode = m_cpu_core_base == &interpreter ? CoreMode::Interpreter : CoreMode::JIT; m_mode = m_cpu_core_base == &interpreter ? CoreMode::Interpreter : CoreMode::JIT;
} }
const std::vector<CPUCore>& AvailableCPUCores() std::span<const CPUCore> AvailableCPUCores()
{ {
static const std::vector<CPUCore> cpu_cores = { static constexpr auto cpu_cores = {
#ifdef _M_X86_64 #ifdef _M_X86_64
CPUCore::JIT64, CPUCore::JIT64,
#elif defined(_M_ARM_64) #elif defined(_M_ARM_64)

3
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -6,6 +6,7 @@
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <iosfwd> #include <iosfwd>
#include <span>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@ -238,7 +239,7 @@ static_assert(offsetof(PowerPC::PowerPCState, above_fits_in_first_0x100) <= 0x10
#endif #endif
#endif #endif
const std::vector<CPUCore>& AvailableCPUCores(); std::span<const CPUCore> AvailableCPUCores();
CPUCore DefaultCPUCore(); CPUCore DefaultCPUCore();
class PowerPCManager class PowerPCManager

10
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -190,9 +190,11 @@ void AdvancedPane::CreateLayout()
void AdvancedPane::ConnectLayout() void AdvancedPane::ConnectLayout()
{ {
connect(m_cpu_emulation_engine_combobox, connect(m_cpu_emulation_engine_combobox, qOverload<int>(&QComboBox::currentIndexChanged),
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [](int index) { [](int index) {
Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]); const auto cpu_cores = PowerPC::AvailableCPUCores();
if (index >= 0 && static_cast<size_t>(index) < cpu_cores.size())
Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, cpu_cores[index]);
}); });
connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) { connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) {
@ -243,7 +245,7 @@ void AdvancedPane::Update()
const bool enable_ram_override_widgets = Config::Get(Config::MAIN_RAM_OVERRIDE_ENABLE); const bool enable_ram_override_widgets = Config::Get(Config::MAIN_RAM_OVERRIDE_ENABLE);
const bool enable_custom_rtc_widgets = Config::Get(Config::MAIN_CUSTOM_RTC_ENABLE) && !running; const bool enable_custom_rtc_widgets = Config::Get(Config::MAIN_CUSTOM_RTC_ENABLE) && !running;
const std::vector<PowerPC::CPUCore>& available_cpu_cores = PowerPC::AvailableCPUCores(); const auto available_cpu_cores = PowerPC::AvailableCPUCores();
const auto cpu_core = Config::Get(Config::MAIN_CPU_CORE); const auto cpu_core = Config::Get(Config::MAIN_CPU_CORE);
for (size_t i = 0; i < available_cpu_cores.size(); ++i) for (size_t i = 0; i < available_cpu_cores.size(); ++i)
{ {