ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/HW: Don't rely on old targets for double-half clear

This commit is contained in:
Stenzek 2024-01-10 18:33:04 +10:00 committed by Connor McLaughlin
parent ad5de248b4
commit 724bb09aec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
View File

@ -5863,7 +5863,7 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
return false; return false;
GSTextureCache::Target* half_point = g_texture_cache->GetExactTarget(half << 5, m_cached_ctx.FRAME.FBW, clear_depth ? GSTextureCache::RenderTarget : GSTextureCache::DepthStencil, half << 5); GSTextureCache::Target* half_point = g_texture_cache->GetExactTarget(half << 5, m_cached_ctx.FRAME.FBW, clear_depth ? GSTextureCache::RenderTarget : GSTextureCache::DepthStencil, half << 5);
if (half_point) if (half_point && half_point->m_age <= 1)
return false; return false;
// Don't allow double half clear to go through when the number of bits written through FRAME and Z are different. // Don't allow double half clear to go through when the number of bits written through FRAME and Z are different.
@ -5901,7 +5901,9 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
// Match either because we got here early or the information is the same on the next draw and the next draw is not a clear. // Match either because we got here early or the information is the same on the next draw and the next draw is not a clear.
// Likely a misdetection. // Likely a misdetection.
if (next_draw_match && !possible_next_clear) if (next_draw_match && !possible_next_clear)
{
return false; return false;
}
else else
{ {
// Check for a target matching the starting point. It might be in Z or FRAME... // Check for a target matching the starting point. It might be in Z or FRAME...
@ -5915,7 +5917,7 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
u32 end_block = ((half + written_pages) * BLOCKS_PER_PAGE) - 1; u32 end_block = ((half + written_pages) * BLOCKS_PER_PAGE) - 1;
if (tgt) if (tgt && tgt->m_age <= 1)
{ {
// Games generally write full pages when doing half clears, so if the half of the buffer doesn't match, we need to round it up to the page edge. // Games generally write full pages when doing half clears, so if the half of the buffer doesn't match, we need to round it up to the page edge.
// Dropship does this with half buffers of 128 high (32 * 4) when the final buffer is only actually 224 high (112 is half, centre of a page). // Dropship does this with half buffers of 128 high (32 * 4) when the final buffer is only actually 224 high (112 is half, centre of a page).
@ -5930,10 +5932,7 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
end_block = GSLocalMemory::GetUnwrappedEndBlockAddress(tgt->m_TEX0.TBP0, tgt->m_TEX0.TBW + 1, tgt->m_TEX0.PSM, target_rect); end_block = GSLocalMemory::GetUnwrappedEndBlockAddress(tgt->m_TEX0.TBP0, tgt->m_TEX0.TBW + 1, tgt->m_TEX0.PSM, target_rect);
else else
end_block = GSLocalMemory::GetUnwrappedEndBlockAddress(tgt->m_TEX0.TBP0, (m_cached_ctx.FRAME.FBW == (tgt->m_TEX0.TBW / 2)) ? tgt->m_TEX0.TBW : m_cached_ctx.FRAME.FBW, tgt->m_TEX0.PSM, target_rect); end_block = GSLocalMemory::GetUnwrappedEndBlockAddress(tgt->m_TEX0.TBP0, (m_cached_ctx.FRAME.FBW == (tgt->m_TEX0.TBW / 2)) ? tgt->m_TEX0.TBW : m_cached_ctx.FRAME.FBW, tgt->m_TEX0.PSM, target_rect);
}
if (tgt)
{
// Siren double half clears horizontally with half FBW instead of vertically. // Siren double half clears horizontally with half FBW instead of vertically.
// We could use the FBW here, but using the rectangle seems a bit safer, because changing FBW // We could use the FBW here, but using the rectangle seems a bit safer, because changing FBW
// from one RT to another isn't uncommon. // from one RT to another isn't uncommon.
@ -5941,7 +5940,9 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
horizontal = (vr.z < vr.w); horizontal = (vr.z < vr.w);
} }
else if (((m_env.CTXT[next_ctx].FRAME.FBW + 1) & ~1) == m_cached_ctx.FRAME.FBW * 2) else if (((m_env.CTXT[next_ctx].FRAME.FBW + 1) & ~1) == m_cached_ctx.FRAME.FBW * 2)
{
horizontal = true; horizontal = true;
}
// Are we clearing over the middle of this target? // Are we clearing over the middle of this target?
if ((((half + written_pages) * BLOCKS_PER_PAGE) - 1) > end_block) if ((((half + written_pages) * BLOCKS_PER_PAGE) - 1) > end_block)