mirror of https://github.com/PCSX2/pcsx2.git
Qt: Show currently active savestate slot on status bar
This commit is contained in:
parent
bad7a94b6d
commit
c3a632e612
|
@ -1016,7 +1016,8 @@ void EmuThread::updatePerformanceMetrics(bool force)
|
||||||
QString gs_stat;
|
QString gs_stat;
|
||||||
if (THREAD_VU1)
|
if (THREAD_VU1)
|
||||||
{
|
{
|
||||||
gs_stat = QStringLiteral("%1 | EE: %2% | VU: %3% | GS: %4%")
|
gs_stat = tr("Slot: %1 | %2 | EE: %3% | VU: %4% | GS: %5%")
|
||||||
|
.arg(VMManager::GetCurrentActiveSaveStateSlot())
|
||||||
.arg(gs_stat_str.c_str())
|
.arg(gs_stat_str.c_str())
|
||||||
.arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
|
.arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
|
||||||
.arg(PerformanceMetrics::GetVUThreadUsage(), 0, 'f', 0)
|
.arg(PerformanceMetrics::GetVUThreadUsage(), 0, 'f', 0)
|
||||||
|
@ -1024,7 +1025,8 @@ void EmuThread::updatePerformanceMetrics(bool force)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gs_stat = QStringLiteral("%1 | EE: %2% | GS: %3%")
|
gs_stat = tr("Slot: %1 | %2 | EE: %3% | GS: %4%")
|
||||||
|
.arg(VMManager::GetCurrentActiveSaveStateSlot())
|
||||||
.arg(gs_stat_str.c_str())
|
.arg(gs_stat_str.c_str())
|
||||||
.arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
|
.arg(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
|
||||||
.arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
|
.arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
|
||||||
|
|
|
@ -31,6 +31,10 @@
|
||||||
|
|
||||||
static s32 s_current_save_slot = 1;
|
static s32 s_current_save_slot = 1;
|
||||||
static std::optional<LimiterModeType> s_limiter_mode_prior_to_hold_interaction;
|
static std::optional<LimiterModeType> s_limiter_mode_prior_to_hold_interaction;
|
||||||
|
s32 VMManager::GetCurrentActiveSaveStateSlot()
|
||||||
|
{
|
||||||
|
return s_current_save_slot;
|
||||||
|
}
|
||||||
|
|
||||||
void VMManager::Internal::ResetVMHotkeyState()
|
void VMManager::Internal::ResetVMHotkeyState()
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,6 +54,9 @@ namespace VMManager
|
||||||
/// The number of usable save state slots.
|
/// The number of usable save state slots.
|
||||||
static constexpr s32 NUM_SAVE_STATE_SLOTS = 10;
|
static constexpr s32 NUM_SAVE_STATE_SLOTS = 10;
|
||||||
|
|
||||||
|
/// Returns the currently active savestate slot.
|
||||||
|
s32 GetCurrentActiveSaveStateSlot();
|
||||||
|
|
||||||
/// The stack size to use for threads running recompilers
|
/// The stack size to use for threads running recompilers
|
||||||
static constexpr std::size_t EMU_THREAD_STACK_SIZE = 2 * 1024 * 1024; // µVU likes recursion
|
static constexpr std::size_t EMU_THREAD_STACK_SIZE = 2 * 1024 * 1024; // µVU likes recursion
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue