GS-hw, TC: search tex in wrapping RT.

Improves Beyond Good & Evil shadow.
PCSX2 · Jan 29, 2022 · b7899d0 · b7899d0
1 parent c1e5e45
commit b7899d0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp
@@ -288,7 +288,6 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 		bool found_t = false;
 		for (auto t : m_dst[RenderTarget])
 		{
-			const bool t_clean = t->m_dirty.empty();
 			if (t->m_used)
 			{
 				// Typical bug (MGS3 blue cloud):
@@ -300,6 +299,9 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 				// Solution: consider the RT as 32 bits if the alpha was used in the past
 				u32 t_psm = (t->m_dirty_alpha) ? t->m_TEX0.PSM & ~0x1 : t->m_TEX0.PSM;
 
+				const bool t_clean = t->m_dirty.empty();
+				const bool t_wraps = t->m_end_block > GSTextureCache::MAX_BP;
+
 				if (t_clean && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t_psm))
 				{
 					// It is a complex to convert the code in shader. As a reference, let's do it on the CPU, it will be slow but
@@ -327,7 +329,9 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 					found_t = true;
 					break;
 				}
-				else if (texture_inside_rt && bw == t->m_TEX0.TBW && psm == PSM_PSMCT32 && t->m_TEX0.PSM == psm && t->m_TEX0.TBP0 < bp && t->m_end_block >= bp) {
+				else if (texture_inside_rt && bw == t->m_TEX0.TBW && psm == PSM_PSMCT32 && t->m_TEX0.PSM == psm &&
+					((t->m_TEX0.TBP0 < bp && t->m_end_block >= bp) || t_wraps))
+				{
 					// BW equality needed because CreateSource does not handle BW conversion.
 					// Only PSMCT32 to limit false hits.
 					// PSM equality needed because CreateSource does not handle PSM conversion.
@@ -338,7 +342,13 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 					// Fixes Xenosaga 3 last dungeon graphic bug.
 					// Fixes Pause menu in The Getaway.
 
-					const SurfaceOffset so = ComputeSurfaceOffset(bp, bw, psm, r, t);
+					SurfaceOffset so = ComputeSurfaceOffset(bp, bw, psm, r, t);
+					if (!so.is_valid && t_wraps)
+					{
+						// Improves Beyond Good & Evil shadow.
+						const u32 bp_unwrap = bp + GSTextureCache::MAX_BP + 0x1;
+						so = ComputeSurfaceOffset(bp_unwrap, bw, psm, r, t);
+					}
 					if (so.is_valid)
 					{
 						dst = t;
@@ -1747,7 +1757,7 @@ GSTextureCache::Surface::Surface(GSRenderer* r, u8* temp)
 	, m_shared_texture(false)
 	, m_end_block(0)
 {
-	m_TEX0.TBP0 = 0x3fff;
+	m_TEX0.TBP0 = GSTextureCache::MAX_BP;
 }
 
 GSTextureCache::Surface::~Surface()

diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.h b/pcsx2/GS/Renderers/HW/GSTextureCache.h
@@ -31,6 +31,8 @@ class GSTextureCache
 		DepthStencil
 	};
 
+	constexpr static u32 MAX_BP = 0x3fff;
+
 	constexpr static bool CheckOverlap(const u32 a_bp, const u32 a_bp_end, const u32 b_bp, const u32 b_bp_end) noexcept
 	{
 		const bool valid = a_bp < a_bp_end && b_bp < b_bp_end;