Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt: Show currently active savestate slot on status bar #10207

Merged
merged 1 commit into from Nov 1, 2023
Merged

Qt: Show currently active savestate slot on status bar #10207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pcsx2-qt/QtHost.cpp
View file
Open in desktop
Expand Up @@ -1016,15 +1016,17 @@ void EmuThread::updatePerformanceMetrics(bool force)
QString gs_stat;
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(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
.arg(PerformanceMetrics::GetVUThreadUsage(), 0, 'f', 0)
.arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
}
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(PerformanceMetrics::GetCPUThreadUsage(), 0, 'f', 0)
.arg(PerformanceMetrics::GetGSThreadUsage(), 0, 'f', 0);
Expand Down
4 changes: 4 additions & 0 deletions pcsx2/Hotkeys.cpp
View file
Open in desktop
Expand Up @@ -31,6 +31,10 @@

static s32 s_current_save_slot = 1;
static std::optional<LimiterModeType> s_limiter_mode_prior_to_hold_interaction;
s32 VMManager::GetCurrentActiveSaveStateSlot()
{
return s_current_save_slot;
}

void VMManager::Internal::ResetVMHotkeyState()
{
Expand Down
3 changes: 3 additions & 0 deletions pcsx2/VMManager.h
View file
Open in desktop
Expand Up @@ -54,6 +54,9 @@ namespace VMManager
/// The number of usable save state slots.
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
static constexpr std::size_t EMU_THREAD_STACK_SIZE = 2 * 1024 * 1024; // µVU likes recursion

Expand Down