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

GS/HW: Fix some target resize/clear handling

This commit is contained in:
refractionpcsx2 2023-12-25 23:57:36 +00:00
parent 5fac15c449
commit 6be2d1cbc0
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2673,6 +2673,9 @@ void GSRendererHW::Draw()
const GSVector2i resolution = PCRTCDisplays.GetResolution(); const GSVector2i resolution = PCRTCDisplays.GetResolution();
GSTextureCache::Target* old_rt = nullptr; GSTextureCache::Target* old_rt = nullptr;
GSTextureCache::Target* old_ds = nullptr; GSTextureCache::Target* old_ds = nullptr;
// If the draw is dated, we're going to expand in to black, so it's just a pointless rescale which will mess up our valid rects and end blocks.
if(!(m_cached_ctx.TEST.DATE && m_cached_ctx.TEST.DATM))
{ {
GSVector2i new_size = t_size; GSVector2i new_size = t_size;

39
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -2181,6 +2181,20 @@ GSTextureCache::Target* GSTextureCache::CreateTarget(GIFRegTEX0 TEX0, const GSVe
// Not *strictly* correct if RGB is masked, but we won't use it as a texture if not.. // Not *strictly* correct if RGB is masked, but we won't use it as a texture if not..
dst->m_valid_rgb = true; dst->m_valid_rgb = true;
// If there is an opposite target without valid RGB, we need to match them up
auto& rev_list = m_dst[1 - type];
for (auto j = rev_list.begin(); j != rev_list.end();)
{
Target* const rev_t = *j;
if (rev_t->m_TEX0.TBP0 == dst->m_TEX0.TBP0 && GSLocalMemory::m_psm[rev_t->m_TEX0.PSM].bpp == GSLocalMemory::m_psm[dst->m_TEX0.PSM].bpp)
{
if(!rev_t->m_valid_rgb)
rev_t->m_was_dst_matched = true;
break;
}
++j;
}
const int bpp = GSLocalMemory::m_psm[TEX0.PSM].trbpp; const int bpp = GSLocalMemory::m_psm[TEX0.PSM].trbpp;
const u32 mask = GSLocalMemory::m_psm[TEX0.PSM].fmsk; const u32 mask = GSLocalMemory::m_psm[TEX0.PSM].fmsk;
// If the alpha is masked and preloaded, we need to say it's valid else textures might fail to use the whole texture if RGB is valid. // If the alpha is masked and preloaded, we need to say it's valid else textures might fail to use the whole texture if RGB is valid.
@ -2774,6 +2788,18 @@ void GSTextureCache::InvalidateContainedTargets(u32 start_bp, u32 end_bp, u32 wr
// Don't keep partial depth buffers around. // Don't keep partial depth buffers around.
if ((!t->m_valid_alpha_low && !t->m_valid_alpha_high && !t->m_valid_rgb) || type == DepthStencil) if ((!t->m_valid_alpha_low && !t->m_valid_alpha_high && !t->m_valid_rgb) || type == DepthStencil)
{ {
auto& rev_list = m_dst[1 - type];
for (auto j = rev_list.begin(); j != rev_list.end();)
{
Target* const rev_t = *j;
if (rev_t->m_TEX0.TBP0 == t->m_TEX0.TBP0 && GSLocalMemory::m_psm[rev_t->m_TEX0.PSM].bpp == GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp)
{
rev_t->m_was_dst_matched = false;
break;
}
++j;
}
GL_CACHE("TC: InvalidateContainedTargets: Remove Target %s[%x, %s]", to_string(type), t->m_TEX0.TBP0, psm_str(t->m_TEX0.PSM)); GL_CACHE("TC: InvalidateContainedTargets: Remove Target %s[%x, %s]", to_string(type), t->m_TEX0.TBP0, psm_str(t->m_TEX0.PSM));
i = list.erase(i); i = list.erase(i);
delete t; delete t;
@ -2828,6 +2854,19 @@ void GSTextureCache::InvalidateVideoMemType(int type, u32 bp, u32 write_psm, u32
// Need to also remove any sources which reference this target. // Need to also remove any sources which reference this target.
InvalidateSourcesFromTarget(t); InvalidateSourcesFromTarget(t);
// If we dst_matched and copied, no need to keep it marked as a copy if the original no longer exists.
auto& rev_list = m_dst[1 - type];
for (auto j = rev_list.begin(); j != rev_list.end();)
{
Target* const rev_t = *j;
if (rev_t->m_TEX0.TBP0 == t->m_TEX0.TBP0 && GSLocalMemory::m_psm[rev_t->m_TEX0.PSM].bpp == GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp)
{
rev_t->m_was_dst_matched = false;
break;
}
++j;
}
list.erase(i); list.erase(i);
delete t; delete t;
break; break;