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

GS/HW: Update drawn area and full valid bits on hardware move

This commit is contained in:
refractionpcsx2 2023-06-23 18:43:17 +01:00
parent 1458511756
commit bb1a366989
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/GS/GSState.cpp
View File

@ -1798,9 +1798,9 @@ void GSState::Write(const u8* mem, int len)
} }
GL_CACHE("Write! %u ... => 0x%x W:%d F:%s (DIR %d%d), dPos(%d %d) size(%d %d)", s_transfer_n, GL_CACHE("Write! %u ... => 0x%x W:%d F:%s (DIR %d%d), dPos(%d %d) size(%d %d)", s_transfer_n,
blit.DBP, blit.DBW, psm_str(blit.DPSM), blit.DBP, blit.DBW, psm_str(blit.DPSM),
m_env.TRXPOS.DIRX, m_env.TRXPOS.DIRY, m_env.TRXPOS.DIRX, m_env.TRXPOS.DIRY,
m_env.TRXPOS.DSAX, m_env.TRXPOS.DSAY, w, h); m_env.TRXPOS.DSAX, m_env.TRXPOS.DSAY, w, h);
if (len >= m_tr.total) if (len >= m_tr.total)
{ {

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

@ -2617,7 +2617,6 @@ bool GSTextureCache::Move(u32 SBP, u32 SBW, u32 SPSM, int sx, int sy, u32 DBP, u
if (dst) if (dst)
{ {
dst->UpdateValidity(GSVector4i(dx, dy, dx + w, dy + h)); dst->UpdateValidity(GSVector4i(dx, dy, dx + w, dy + h));
dst->m_valid_bits = src->m_valid_bits;
dst->OffsetHack_modxy = src->OffsetHack_modxy; dst->OffsetHack_modxy = src->OffsetHack_modxy;
} }
} }
@ -2727,7 +2726,12 @@ bool GSTextureCache::Move(u32 SBP, u32 SBW, u32 SPSM, int sx, int sy, u32 DBP, u
scaled_dx, scaled_dy); scaled_dx, scaled_dy);
} }
// You'd think we'd update to use the source valid bits, but it's not, because it might be copying some data which was uploaded and dirtied the target.
// An example of this is Cross Channel - To All People where it renders a picture with 0x7f000000 FBMSK at 0x1180, which was all cleared to black on boot,
// Then it moves it to 0x2e80, where some garbage has been loaded underneath, so we can't assume that's the only valid data.
dst->UpdateValidBits(GSLocalMemory::m_psm[DPSM].fmsk);
dst->UpdateValidity(GSVector4i(dx, dy, dx + w, dy + h)); dst->UpdateValidity(GSVector4i(dx, dy, dx + w, dy + h));
dst->UpdateDrawn(GSVector4i(dx, dy, dx + w, dy + h));
// Invalidate any sources that overlap with the target (since they're now stale). // Invalidate any sources that overlap with the target (since they're now stale).
InvalidateVideoMem(g_gs_renderer->m_mem.GetOffset(DBP, DBW, DPSM), GSVector4i(dx, dy, dx + w, dy + h), false); InvalidateVideoMem(g_gs_renderer->m_mem.GetOffset(DBP, DBW, DPSM), GSVector4i(dx, dy, dx + w, dy + h), false);
return true; return true;