PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

GS: Make sure hardware local->local transfers get logged

Browse Source
This commit is contained in:
refractionpcsx2
2026-09-14 06:22:27 +02:00
committed by lightningterror
parent 112cc226b7
commit 489778cf6d
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/GS/GSState.cpp
+7 -4
View File
@@ -1359,8 +1359,9 @@ void GSState::DumpTransferImages()
transfer.rect.x, transfer.rect.y, transfer.rect.z, transfer.rect.w);
}
m_mem.SaveBMP(filename, transfer.blit.DBP, transfer.blit.DBW, transfer.blit.DPSM,
transfer.rect.width(), transfer.rect.height(), transfer.rect.x, transfer.rect.y);
if (!transfer.was_hardware_only)
m_mem.SaveBMP(filename, transfer.blit.DBP, transfer.blit.DBW, transfer.blit.DPSM,
transfer.rect.width(), transfer.rect.height(), transfer.rect.x, transfer.rect.y);
}
}
@@ -2932,11 +2933,12 @@ void GSState::Write(const u8* mem, int len)
m_draw_transfers.pop_back();
transfer.rect = transfer.rect.runion(r);
transfer.draw = s_n;
transfer.was_hardware_only = false;
m_draw_transfers.push_back(transfer);
}
else
{
const GSUploadQueue new_transfer = {blit, s_n, r, EEGS_TransferType::EE_to_GS};
const GSUploadQueue new_transfer = {blit, s_n, r, EEGS_TransferType::EE_to_GS, false};
m_draw_transfers.push_back(new_transfer);
}
@@ -3131,11 +3133,12 @@ void GSState::Move()
m_draw_transfers.pop_back();
transfer.rect = transfer.rect.runion(r);
transfer.draw = s_n;
transfer.was_hardware_only = false;
m_draw_transfers.push_back(transfer);
}
else
{
const GSUploadQueue new_transfer = {m_env.BITBLTBUF, s_n, r, EEGS_TransferType::GS_to_GS};
const GSUploadQueue new_transfer = {m_env.BITBLTBUF, s_n, r, EEGS_TransferType::GS_to_GS, false};
m_draw_transfers.push_back(new_transfer);
}
pcsx2/GS/GSState.h
+1
View File
@@ -269,6 +269,7 @@ public:
u64 draw;
GSVector4i rect;
EEGS_TransferType transfer_type;
bool was_hardware_only;
};
enum NoGapsType
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+19
View File
@@ -2364,6 +2364,23 @@ void GSRendererHW::Move()
if (g_texture_cache->Move(m_env.BITBLTBUF.SBP, m_env.BITBLTBUF.SBW, m_env.BITBLTBUF.SPSM, sx, sy,
m_env.BITBLTBUF.DBP, m_env.BITBLTBUF.DBW, m_env.BITBLTBUF.DPSM, dx, dy, w, h))
{
// Store the transfer for preloading new RT's.
if ((m_draw_transfers.size() > 0 && m_env.BITBLTBUF.DBP == m_draw_transfers.back().blit.DBP && m_draw_transfers.back().transfer_type == EEGS_TransferType::GS_to_GS))
{
// Same BP, let's update the rect.
GSUploadQueue transfer = m_draw_transfers.back();
m_draw_transfers.pop_back();
transfer.rect = transfer.rect.runion(GSVector4i(dx, dy, dx + w, dy + h));
transfer.draw = s_n;
transfer.was_hardware_only = true;
m_draw_transfers.push_back(transfer);
}
else
{
const GSUploadQueue new_transfer = {m_env.BITBLTBUF, s_n, GSVector4i(dx, dy, dx + w, dy + h), EEGS_TransferType::GS_to_GS, true};
m_draw_transfers.push_back(new_transfer);
}
m_env.TRXDIR.XDIR = 3;
// Handled entirely in TC, no need to update local memory.
return;
@@ -10321,6 +10338,7 @@ bool GSRendererHW::TryGSMemClear(bool no_rt, bool preserve_rt, bool invalidate_r
clear_queue.blit.DBP = m_cached_ctx.FRAME.Block();
clear_queue.blit.DBW = m_cached_ctx.FRAME.FBW;
clear_queue.blit.DPSM = m_cached_ctx.FRAME.PSM;
clear_queue.was_hardware_only = false;
m_draw_transfers.push_back(clear_queue);
}
else
@@ -10351,6 +10369,7 @@ bool GSRendererHW::TryGSMemClear(bool no_rt, bool preserve_rt, bool invalidate_r
clear_queue.blit.DBP = m_cached_ctx.ZBUF.Block();
clear_queue.blit.DBW = m_cached_ctx.FRAME.FBW;
clear_queue.blit.DPSM = m_cached_ctx.ZBUF.PSM;
clear_queue.was_hardware_only = false;
m_draw_transfers.push_back(clear_queue);
}
}
pcsx2/GS/Renderers/HW/GSRendererHWMultiISA.cpp
+1
View File
@@ -570,6 +570,7 @@ bool GSRendererHWFunctions::SwPrimRender(GSRendererHW& hw, bool invalidate_tc, b
uq.blit.DPSM = hw.m_cached_ctx.FRAME.PSM;
uq.draw = GSState::s_n;
uq.rect = bbox;
uq.was_hardware_only = false;
hw.m_draw_transfers.push_back(uq);
}
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
+3
View File
@@ -4105,6 +4105,9 @@ GSTextureCache::Target* GSTextureCache::LookupDisplayTarget(GIFRegTEX0 TEX0, con
if (last_draw - iter->draw > 500)
break;
if (iter->was_hardware_only)
continue;
const u32 transfer_end = GSLocalMemory::GetUnwrappedEndBlockAddress(iter->blit.DBP, iter->blit.DBW, iter->blit.DPSM, iter->rect);
// If the format, and location doesn't overlap