sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPU: Tweaks to ODE handling

Browse Source 
Fixes Team Buddies and The Next Tetris.
This commit is contained in:
Connor McLaughlin
2020-08-15 14:56:20 +10:00
parent a8699d9908
commit d4665e8b22
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/system.cpp
View File

@ -227,7 +227,7 @@ bool RecreateGPU(GPURenderer renderer)
// save current state
std::unique_ptr<ByteStream> state_stream = ByteStream_CreateGrowableMemoryStream();
StateWrapper sw(state_stream.get(), StateWrapper::Mode::Write);
const bool state_valid = g_gpu->DoState(sw) && TimingEvents::DoState(sw, TimingEvents::GetGlobalTickCounter());
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");
@ -247,7 +247,7 @@ bool RecreateGPU(GPURenderer renderer)
sw.SetMode(StateWrapper::Mode::Read);
g_gpu->RestoreGraphicsAPIState();
g_gpu->DoState(sw);
TimingEvents::DoState(sw, TimingEvents::GetGlobalTickCounter());
TimingEvents::DoState(sw);
g_gpu->ResetGraphicsAPIState();
}
@ -540,13 +540,9 @@ bool DoState(StateWrapper& sw)
if (!sw.DoMarker("System"))
return false;
// TODO: Move this into timing state
u32 global_tick_counter = TimingEvents::GetGlobalTickCounter();
sw.Do(&s_region);
sw.Do(&s_frame_number);
sw.Do(&s_internal_frame_number);
sw.Do(&global_tick_counter);
if (!sw.DoMarker("CPU") || !CPU::DoState(sw))
return false;
@ -584,7 +580,7 @@ bool DoState(StateWrapper& sw)
if (!sw.DoMarker("SIO") || !g_sio.DoState(sw))
return false;
if (!sw.DoMarker("Events") || !TimingEvents::DoState(sw, global_tick_counter))
if (!sw.DoMarker("Events") || !TimingEvents::DoState(sw))
return false;
return !sw.HasError();