history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-17 19:45:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

StateWrapper: Track save state version

Browse Source
This commit is contained in:
Connor McLaughlin
2020-10-12 20:46:59 +10:00
parent 893268bba5
commit 69b2c3fc2d
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/save_state_version.h
View File

@ -3,6 +3,7 @@
static constexpr u32 SAVE_STATE_MAGIC = 0x43435544;
static constexpr u32 SAVE_STATE_VERSION = 42;
static constexpr u32 SAVE_STATE_MINIMUM_VERSION = 42;
#pragma pack(push, 4)
struct SAVE_STATE_HEADER

12
src/core/system.cpp
View File

@ -491,7 +491,7 @@ bool RecreateGPU(GPURenderer renderer)
// save current state
std::unique_ptr<ByteStream> state_stream = ByteStream_CreateGrowableMemoryStream();
StateWrapper sw(state_stream.get(), StateWrapper::Mode::Write);
StateWrapper sw(state_stream.get(), StateWrapper::Mode::Write, SAVE_STATE_VERSION);
const bool state_valid = g_gpu->DoState(sw) && TimingEvents::DoState(sw);
if (!state_valid)
Log_ErrorPrintf("Failed to save old GPU state when switching renderers");
@ -946,12 +946,12 @@ bool DoLoadState(ByteStream* state, bool force_software_renderer)
if (header.magic != SAVE_STATE_MAGIC)
return false;
if (header.version != SAVE_STATE_VERSION)
if (header.version < SAVE_STATE_MINIMUM_VERSION)
{
g_host_interface->ReportFormattedError(
g_host_interface->TranslateString("System",
"Save state is incompatible: expecting version %u but state is version %u."),
SAVE_STATE_VERSION, header.version);
"Save state is incompatible: minimum version is %u but state is version %u."),
SAVE_STATE_MINIMUM_VERSION, header.version);
return false;
}
@ -1041,7 +1041,7 @@ bool DoLoadState(ByteStream* state, bool force_software_renderer)
if (!state->SeekAbsolute(header.offset_to_data))
return false;
StateWrapper sw(state, StateWrapper::Mode::Read);
StateWrapper sw(state, StateWrapper::Mode::Read, header.version);
if (!DoState(sw))
return false;
@ -1108,7 +1108,7 @@ bool SaveState(ByteStream* state, u32 screenshot_size /* = 128 */)
g_gpu->RestoreGraphicsAPIState();
StateWrapper sw(state, StateWrapper::Mode::Write);
StateWrapper sw(state, StateWrapper::Mode::Write, SAVE_STATE_VERSION);
const bool result = DoState(sw);
g_gpu->ResetGraphicsAPIState();