From 2068240e1afde9a092d1cd339794ebc822107dd9 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Mon, 14 Mar 2022 18:30:42 +0000 Subject: [PATCH] GS: Adjust Auto Flush to catch edge cases Affected Beyond Good and Evil water --- pcsx2/GS/GSLocalMemory.cpp | 12 ++++++++++++ pcsx2/GS/GSLocalMemory.h | 1 + pcsx2/GS/GSState.cpp | 22 +++++++++++++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pcsx2/GS/GSLocalMemory.cpp b/pcsx2/GS/GSLocalMemory.cpp index a1d00f20c3..106ca11045 100644 --- a/pcsx2/GS/GSLocalMemory.cpp +++ b/pcsx2/GS/GSLocalMemory.cpp @@ -106,6 +106,7 @@ GSLocalMemory::GSLocalMemory() psm.pgs = GSVector2i(64, 32); psm.msk = 0xff; psm.depth = 0; + psm.fmsk = 0xffffffff; } m_psm[PSM_PSGPU24].info = GSLocalMemory::swizzle16; @@ -346,6 +347,17 @@ GSLocalMemory::GSLocalMemory() m_psm[PSM_PSMZ24].depth = 1; m_psm[PSM_PSMZ16].depth = 1; m_psm[PSM_PSMZ16S].depth = 1; + + m_psm[PSM_PSMCT24].fmsk = 0x00FFFFFF; + m_psm[PSM_PSGPU24].fmsk = 0x00FFFFFF; + m_psm[PSM_PSMCT16].fmsk = 0x80F8F8F8; + m_psm[PSM_PSMCT16S].fmsk = 0x80F8F8F8; + m_psm[PSM_PSMT8H].fmsk = 0xFF000000; + m_psm[PSM_PSMT4HL].fmsk = 0x0F000000; + m_psm[PSM_PSMT4HH].fmsk = 0xF0000000; + m_psm[PSM_PSMZ24].fmsk = 0x00FFFFFF; + m_psm[PSM_PSMZ16].fmsk = 0x80F8F8F8; + m_psm[PSM_PSMZ16S].fmsk = 0x80F8F8F8; } GSLocalMemory::~GSLocalMemory() diff --git a/pcsx2/GS/GSLocalMemory.h b/pcsx2/GS/GSLocalMemory.h index 6dc3f0484a..4b4c7a052e 100644 --- a/pcsx2/GS/GSLocalMemory.h +++ b/pcsx2/GS/GSLocalMemory.h @@ -468,6 +468,7 @@ public: u16 bpp, trbpp, pal, fmt; GSVector2i bs, pgs; u8 msk, depth; + u32 fmsk; }; static psm_t m_psm[64]; diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp index b3d2dda0d2..c49085db67 100644 --- a/pcsx2/GS/GSState.cpp +++ b/pcsx2/GS/GSState.cpp @@ -2579,14 +2579,17 @@ GSState::PRIM_OVERLAP GSState::PrimitiveOverlap() __forceinline void GSState::HandleAutoFlush() { - const bool frame_hit = (m_context->FRAME.Block() == m_context->TEX0.TBP0) && !(m_context->TEST.ATE && m_context->TEST.ATST == 0 && m_context->TEST.AFAIL == 2); + const u32 frame_mask = GSLocalMemory::m_psm[m_context->TEX0.PSM].fmsk; + const bool frame_hit = (m_context->FRAME.Block() == m_context->TEX0.TBP0) && !(m_context->TEST.ATE && m_context->TEST.ATST == 0 && m_context->TEST.AFAIL == 2) && ((m_context->FRAME.FBMSK & frame_mask) != frame_mask); // There's a strange behaviour we need to test on a PS2 here, if the FRAME is a Z format, like Powerdrome something swaps over, and it seems Alpha Fail of "FB Only" writes to the Z.. it's odd. const bool zbuf_hit = (m_context->ZBUF.Block() == m_context->TEX0.TBP0) && !(m_context->TEST.ATE && m_context->TEST.ATST == 0 && m_context->TEST.AFAIL != 2) && !m_context->ZBUF.ZMSK; + const u32 frame_z_psm = frame_hit ? m_context->FRAME.PSM : m_context->ZBUF.PSM; + const u32 frame_z_bp = frame_hit ? m_context->FRAME.Block() : m_context->ZBUF.Block(); // To briefly explain what's going on here, what we are checking for is draws over a texture when the source and destination are themselves. // Because one page of the texture gets buffered in the Texture Cache (the PS2's one) if any of those pixels are overwritten, you still read the old data. // So we need to calculate if a page boundary is being crossed for the format it is in and if the same part of the texture being written and read inside the draw. - if (((frame_hit && ((m_context->TEX0.PSM ^ m_context->FRAME.PSM) & ~0x30) == 0) || (zbuf_hit && ((m_context->TEX0.PSM ^ m_context->ZBUF.PSM) & ~0x30) == 0)) && PRIM->TME && (m_context->FRAME.FBMSK != 0xFFFFFFFF)) + if (PRIM->TME && (frame_hit || zbuf_hit) && GSUtil::HasSharedBits(frame_z_bp, frame_z_psm, m_context->TEX0.TBP0, m_context->TEX0.PSM)) { const int page_mask_x = ~(GSLocalMemory::m_psm[m_context->TEX0.PSM].pgs.x - 1); const int page_mask_y = ~(GSLocalMemory::m_psm[m_context->TEX0.PSM].pgs.y - 1); @@ -2664,21 +2667,23 @@ __forceinline void GSState::HandleAutoFlush() if(page_crossed) { // Make sure the format matches, otherwise the coordinates aren't gonna match, so the draws won't intersect. - if (((frame_hit && (m_context->TEX0.PSM == m_context->FRAME.PSM)) || (zbuf_hit && (m_context->TEX0.PSM == m_context->ZBUF.PSM))) - && (m_context->FRAME.FBW == m_context->TEX0.TBW)) + if (GSUtil::HasCompatibleBits(m_context->TEX0.PSM, frame_z_psm) && (m_context->FRAME.FBW == m_context->TEX0.TBW)) { // Update the vertex trace, scissor it (important for Jak 3!) and intersect with the current texture. if ((m_index.tail - 1) == current_tex_end) m_vt.Update(m_vertex.buff, m_index.buff, m_vertex.tail - m_vertex.head, m_index.tail, GSUtil::GetPrimClass(PRIM->PRIM)); - GSVector4i area_out = GSVector4i(m_vt.m_min.p.xyxy(m_vt.m_max.p)).rintersect(GSVector4i(m_context->scissor.in)); + // Intersect goes on space inside the rect + GSVector4i area_out = GSVector4i(m_vt.m_min.p.xyxy(m_vt.m_max.p)) + GSVector4i(0, 0, 1, 1); + // Scissor output + area_out = area_out.rintersect(GSVector4i(m_context->scissor.in)); + // Intersect with texture if (!area_out.rintersect(tex_rect).rempty()) - { Flush(); - } } else // Storage of the TEX and FRAME/Z is different, so uhh, just fall back to flushing each page. It's slower, sorry. { + if (m_context->FRAME.FBW == m_context->TEX0.TBW) { //We know we've changed page, so let's set the dimension to cover the page they're in (for different pixel orders) @@ -2695,10 +2700,9 @@ __forceinline void GSState::HandleAutoFlush() area_out += GSVector4i(0, 0, 1, 1); // Intersect goes on space inside the rect area_out.z += GSLocalMemory::m_psm[m_context->TEX0.PSM].pgs.x; area_out.w += GSLocalMemory::m_psm[m_context->TEX0.PSM].pgs.y; + if (!area_out.rintersect(tex_rect).rempty()) - { Flush(); - } } else // Page width is different, so it's much more difficult to calculate where it's modifying. Flush();