GS/HW: Get the proper context for the next draw if it's a split texture shuffle.

Draw might switch the context so make sure we get the correct one.
GameDB: Japanese game updates
2026-01-31 01:15:24 +01:00 · 2024-12-16 08:37:39 +01:00 · 2024-12-15 01:33:40 -06:00
2 changed files with 8451 additions and 6138 deletions
--- a/bin/resources/GameIndex.yaml
+++ b/bin/resources/GameIndex.yaml
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
@@ -1012,7 +1012,8 @@ bool GSRendererHW::NextDrawMatchesShuffle() const
 {
 	// Make sure nothing unexpected has changed.
 	// Twinsanity seems to screw with ZBUF here despite it being irrelevant.
-	const GSDrawingContext& next_ctx = m_env.CTXT[m_backed_up_ctx];
+	const int get_next_ctx = (m_state_flush_reason == CONTEXTCHANGE) ? m_env.PRIM.CTXT : m_backed_up_ctx;
+	const GSDrawingContext& next_ctx = m_env.CTXT[get_next_ctx];
 	if (((m_context->TEX0.U64 ^ next_ctx.TEX0.U64) & (~0x3FFF)) != 0 ||
 		m_context->TEX1.U64 != next_ctx.TEX1.U64 ||
 		m_context->CLAMP.U64 != next_ctx.CLAMP.U64 ||
Author	SHA1	Message	Date
lightningterror	c2ee5a0234	GS/HW: Get the proper context for the next draw if it's a split texture shuffle. Draw might switch the context so make sure we get the correct one.	2024-12-16 08:37:39 +01:00
nassau-tk	3cafd2dc69	GameDB: Japanese game updates	2024-12-15 01:33:40 -06:00