From 67198a72bda723734398078b1f2195644ed28706 Mon Sep 17 00:00:00 2001 From: Jaklyy <102590697+Jaklyy@users.noreply.github.com> Date: Mon, 16 Dec 2024 10:32:18 -0500 Subject: [PATCH] why did i remove that This reverts commit 45be951a0f164488d151d87ed6caa4b0633feba7. --- src/GPU3D.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp index 4a1426aa..953a2343 100644 --- a/src/GPU3D.cpp +++ b/src/GPU3D.cpp @@ -2378,13 +2378,13 @@ void GPU3D::Run() noexcept if (!GeometryEnabled || FlushRequest || (CmdPIPE.IsEmpty() && !(GXStat & (1<<27)))) { - Timestamp = NDS.ARM9Timestamp >> NDS.ARM9ClockShift; + Timestamp = std::max(NDS.ARM9Timestamp, NDS.DMA9Timestamp) >> NDS.ARM9ClockShift; return; } - s32 cycles = (NDS.ARM9Timestamp >> NDS.ARM9ClockShift) - Timestamp; + s32 cycles = (std::max(NDS.ARM9Timestamp, NDS.DMA9Timestamp) >> NDS.ARM9ClockShift) - Timestamp; CycleCount -= cycles; - Timestamp = NDS.ARM9Timestamp >> NDS.ARM9ClockShift; + Timestamp = std::max(NDS.ARM9Timestamp, NDS.DMA9Timestamp) >> NDS.ARM9ClockShift; if (CycleCount <= 0) {