From 31642ceca935768d6abc0891a402ec10e0c49caa Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Sat, 25 Nov 2023 00:45:38 +0000 Subject: [PATCH] GS/HW: Partial revert earlier FMV fix --- pcsx2/GS/Renderers/Common/GSRenderer.cpp | 5 ----- pcsx2/GS/Renderers/Common/GSRenderer.h | 1 - pcsx2/GS/Renderers/HW/GSRendererHW.cpp | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.cpp b/pcsx2/GS/Renderers/Common/GSRenderer.cpp index 4542e2a70b..73262ccf05 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.cpp +++ b/pcsx2/GS/Renderers/Common/GSRenderer.cpp @@ -944,11 +944,6 @@ bool GSRenderer::IsIdleFrame() const return (m_last_draw_n == s_n && m_last_transfer_n == s_transfer_n); } -int GSRenderer::GetLastVSyncDraw() const -{ - return m_last_draw_n; -} - bool GSRenderer::SaveSnapshotToMemory(u32 window_width, u32 window_height, bool apply_aspect, bool crop_borders, u32* width, u32* height, std::vector* pixels) { diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.h b/pcsx2/GS/Renderers/Common/GSRenderer.h index e061ff9e9e..c5b56ef790 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.h +++ b/pcsx2/GS/Renderers/Common/GSRenderer.h @@ -68,7 +68,6 @@ public: virtual GSTexture* LookupPaletteSource(u32 CBP, u32 CPSM, u32 CBW, GSVector2i& offset, float* scale, const GSVector2i& size); bool IsIdleFrame() const; - int GetLastVSyncDraw() const; bool SaveSnapshotToMemory(u32 window_width, u32 window_height, bool apply_aspect, bool crop_borders, u32* width, u32* height, std::vector* pixels); diff --git a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp index 2e0d05408e..8fa36e76e8 100644 --- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp +++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp @@ -113,7 +113,7 @@ void GSRendererHW::VSync(u32 field, bool registers_written, bool idle_frame) { // If it did draws very recently, we should keep the recent stuff in case it hasn't been preloaded/used yet. // Rocky Legend does this with the main menu FMV's. - if (s_last_transfer_draw_n > (s_n - 5) && s_last_transfer_draw_n >= GetLastVSyncDraw()) + if (s_last_transfer_draw_n > (s_n - 5)) { for (auto iter = m_draw_transfers.rbegin(); iter != m_draw_transfers.rend(); iter++) {