preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-21 02:09:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework the internal screenshot API, fix bug causing screenshotting to get stuck

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-02-13 12:34:26 +01:00
1 parent f2459aa0f4
commit 386fc442a6
13 files changed
+246 -211
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/SaveState.cpp
+19 -43
View File
@@ -116,9 +116,6 @@ struct Operation {
static std::vector<Operation> g_pendingOperations;
// If this isn't empty, a screenshot operation is pending. It's protected by mutex.
Path g_screenshotPath;
int g_screenshotFailures;
CChunkFileReader::Error SaveToRam(std::vector<u8> &data) {
@@ -383,8 +380,26 @@ int g_screenshotFailures;
static void ScheduleSaveScreenshot(const Path &path) {
std::lock_guard<std::mutex> guard(mutex);
g_screenshotPath = path;
g_screenshotFailures = 0;
// Savestate thumbnails don't need to be bigger.
constexpr int maxResMultiplier = 2;
ScheduleScreenshot(path, ScreenshotFormat::JPG, ScreenshotType::Display, maxResMultiplier, [path](ScreenshotResult result) {
switch (result) {
case ScreenshotResult::ScreenshotNotPossible:
// Try again soon, for a short while.
WARN_LOG(Log::SaveState, "Failed to take a screenshot for the savestate! (%s) The savestate will lack an icon.", path.c_str());
if (coreState != CORE_STEPPING_CPU && g_screenshotFailures++ < SCREENSHOT_FAILURE_RETRIES) {
// Requeue for next frame (if we were stepping, no point, will just spam errors quickly).
ScheduleSaveScreenshot(path);
}
break;
case ScreenshotResult::FailedToWriteFile:
case ScreenshotResult::Success:
g_screenshotFailures = 0;
break;
}
});
}
void LoadSlot(std::string_view gamePrefix, int slot, Callback callback) {
@@ -973,43 +988,4 @@ int g_screenshotFailures;
}
}
bool ProcessScreenshot(bool skipBufferEffects) {
Path screenshotPath;
{
std::lock_guard<std::mutex> guard(mutex);
if (!g_screenshotPath.empty()) {
screenshotPath = g_screenshotPath;
g_screenshotPath.clear();
} else {
return false;
}
}
// Savestate thumbnails don't need to be bigger.
constexpr int maxResMultiplier = 2;
ScreenshotResult tempResult = TakeGameScreenshot(nullptr, screenshotPath, ScreenshotFormat::JPG, SCREENSHOT_DISPLAY, maxResMultiplier, [](bool success) {
if (success) {
g_screenshotFailures = 0;
}
});
switch (tempResult) {
case ScreenshotResult::ScreenshotNotPossible:
// Try again soon, for a short while.
WARN_LOG(Log::SaveState, "Failed to take a screenshot for the savestate! (%s) The savestate will lack an icon.", g_screenshotPath.c_str());
if (coreState != CORE_STEPPING_CPU && g_screenshotFailures++ < SCREENSHOT_FAILURE_RETRIES) {
// Requeue for next frame (if we were stepping, no point, will just spam errors quickly).
ScheduleSaveScreenshot(g_screenshotPath);
}
break;
case ScreenshotResult::FailedToWriteFile:
break;
case ScreenshotResult::DelayedResult:
return true;
case ScreenshotResult::Success:
return true;
}
return false; // Didn't take a screenshot right now.
}
} // namespace SaveState