Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-31 03:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Don't discard PGXP state when runahead-rollbacking

Browse source 
You'll still see some glitches if you have the frame count set too high,
since you'll get imprecise values for any vertices which have moved, but
that's going to happen anyway because of the runahead in the first
place.
This commit is contained in:
Connor McLaughlin 2021-04-28 02:50:46 +10:00
parent c2916e0719
commit f1310bf93a
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/cpu_core.cpp
View file

@ -101,15 +101,10 @@ void Initialize()
UpdateFastmemBase();
GTE::Initialize();
if (g_settings.gpu_pgxp_enable)
PGXP::Initialize();
}
void Shutdown()
{
// GTE::Shutdown();
PGXP::Shutdown();
ClearBreakpoints();
StopTrace();
}
@ -137,9 +132,6 @@ void Reset()
GTE::Reset();
SetPC(RESET_VECTOR);
if (g_settings.gpu_pgxp_enable)
PGXP::Initialize();
}
bool DoState(StateWrapper& sw)
@ -188,12 +180,6 @@ bool DoState(StateWrapper& sw)
sw.Do(&g_state.icache_data);
}
if (sw.IsReading())
{
if (g_settings.gpu_pgxp_enable)
PGXP::Initialize();
}
return !sw.HasError();
}

22
src/core/system.cpp
View file

@ -27,6 +27,7 @@
#include "memory_card.h"
#include "multitap.h"
#include "pad.h"
#include "pgxp.h"
#include "psf_loader.h"
#include "save_state_version.h"
#include "sio.h"
@ -849,10 +850,20 @@ bool Initialize(bool force_software_renderer)
CPU::Initialize();
if (!Bus::Initialize())
{
CPU::Shutdown();
return false;
}
if (!CreateGPU(force_software_renderer ? GPURenderer::Software : g_settings.gpu_renderer))
{
Bus::Shutdown();
CPU::Shutdown();
return false;
}
if (g_settings.gpu_pgxp_enable)
PGXP::Initialize();
// Was startup cancelled? (e.g. shading compilers took too long and the user closed the application)
if (IsStartupCancelled())
@ -915,6 +926,7 @@ void Shutdown()
g_gpu.reset();
g_interrupt_controller.Shutdown();
g_dma.Shutdown();
PGXP::Shutdown();
CPU::CodeCache::Shutdown();
Bus::Shutdown();
CPU::Shutdown();
@ -974,6 +986,8 @@ bool CreateGPU(GPURenderer renderer)
bool DoState(StateWrapper& sw, HostDisplayTexture** host_texture, bool update_display)
{
const bool is_memory_state = (host_texture != nullptr);
if (!sw.DoMarker("System"))
return false;
@ -987,6 +1001,11 @@ bool DoState(StateWrapper& sw, HostDisplayTexture** host_texture, bool update_di
if (sw.IsReading())
CPU::CodeCache::Flush();
// only reset pgxp if we're not runahead-rollbacking. the value checks will save us from broken rendering, and it
// saves using imprecise values for a frame in 30fps games.
if (sw.IsReading() && g_settings.gpu_pgxp_enable && !is_memory_state)
PGXP::Initialize();
if (!sw.DoMarker("Bus") || !Bus::DoState(sw))
return false;
@ -1060,6 +1079,9 @@ void Reset()
CPU::Reset();
CPU::CodeCache::Flush();
if (g_settings.gpu_pgxp_enable)
PGXP::Initialize();
Bus::Reset();
g_dma.Reset();
g_interrupt_controller.Reset();