ggpo: move end of frame back to original renderer location, fixes scr…

…een flashing on rollback for naomi 2
blueminder · Feb 2, 2023 · 4768631 · 4768631
1 parent 199d5be
commit 4768631
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp
@@ -396,12 +396,15 @@ void rend_start_render()
 	ctx->rend.fog_clamp_min = FOG_CLAMP_MIN;
 	ctx->rend.fog_clamp_max = FOG_CLAMP_MAX;
 
+	bool present = !config::DelayFrameSwapping && !ctx->rend.isRTT && !config::EmulateFramebuffer;
+	if (present)
+		ggpo::endOfFrame();
 	if (QueueRender(ctx))
 	{
 		palette_update();
 		pend_rend = true;
 		pvrQueue.enqueue(PvrMessageQueue::Render);
-		if (!config::DelayFrameSwapping && !ctx->rend.isRTT && !config::EmulateFramebuffer)
+		if (present)
 			pvrQueue.enqueue(PvrMessageQueue::Present);
 	}
 }
@@ -437,6 +440,7 @@ void rend_vblank()
 			fbInfo.update();
 			pvrQueue.enqueue(PvrMessageQueue::RenderFramebuffer, fbInfo);
 			pvrQueue.enqueue(PvrMessageQueue::Present);
+			ggpo::endOfFrame();
 			if (!config::EmulateFramebuffer)
 				DEBUG_LOG(PVR, "Direct framebuffer write detected");
 		}
@@ -479,7 +483,11 @@ void rend_set_fb_write_addr(u32 fb_w_sof1)
 void rend_swap_frame(u32 fb_r_sof)
 {
 	if (!config::EmulateFramebuffer && fb_r_sof == fb_w_cur && rend_is_enabled())
+	{
 		pvrQueue.enqueue(PvrMessageQueue::Present);
+		if (config::DelayFrameSwapping)
+			ggpo::endOfFrame();
+	}
 }
 
 void rend_disable_rollback()

diff --git a/core/hw/pvr/spg.cpp b/core/hw/pvr/spg.cpp
@@ -6,7 +6,6 @@
 #include "oslib/oslib.h"
 #include "hw/maple/maple_if.h"
 #include "serialize.h"
-#include "network/ggpo.h"
 #include "hw/pvr/Renderer_if.h"
 
 #ifdef TEST_AUTOMATION
@@ -113,7 +112,6 @@ static int spg_line_sched(int tag, int cycles, int jitter)
 				SB_MDST = 0;
 			}
 			asic_RaiseInterrupt(holly_SCANINT1);
-			ggpo::endOfFrame();
 		}
 
 		if (SPG_VBLANK_INT.vblank_out_interrupt_line_number == prv_cur_scanline)