From 6f99383733bf19cfaa295e3d3231f96af7277772 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 9 Dec 2017 21:49:25 -0800 Subject: [PATCH 1/2] Display: Reset cycle counter on load state. --- Core/HLE/sceDisplay.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 76e51aeeff..33f8df716e 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -240,7 +240,7 @@ struct GPUStatistics_v0 { }; void __DisplayDoState(PointerWrap &p) { - auto s = p.Section("sceDisplay", 1, 6); + auto s = p.Section("sceDisplay", 1, 7); if (!s) return; @@ -306,8 +306,17 @@ void __DisplayDoState(PointerWrap &p) { GPUStatistics_v0 oldStats; p.Do(oldStats); } - gpu->DoState(p); + if (s < 7) { + u64 now = CoreTiming::GetTicks(); + lastFlipCycles = now; + nextFlipCycles = now; + } else { + p.Do(lastFlipCycles); + p.Do(nextFlipCycles); + } + + gpu->DoState(p); gpu->ReapplyGfxState(); if (p.mode == p.MODE_READ) { From 1776726bd6dc4660cdd7c2e46d9a44482c609b2a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 9 Dec 2017 21:54:48 -0800 Subject: [PATCH 2/2] Display: Only reapply state on load. Shouldn't be needed on save. --- Core/HLE/sceDisplay.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 33f8df716e..90c5f07de7 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -317,9 +317,10 @@ void __DisplayDoState(PointerWrap &p) { } gpu->DoState(p); - gpu->ReapplyGfxState(); if (p.mode == p.MODE_READ) { + gpu->ReapplyGfxState(); + if (hasSetMode) { gpu->InitClear(); }