From 21bf2d2cffc70cca996b45b0f482e45a211b37b2 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Fri, 24 Jan 2025 22:23:27 +0000 Subject: [PATCH] GS/HW: Don't update TBP on targets + make target src's temporary --- pcsx2/GS/Renderers/HW/GSRendererHW.cpp | 4 ++++ pcsx2/GS/Renderers/HW/GSTextureCache.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp index 137266f5f4..fbddb612aa 100644 --- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp +++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp @@ -3493,6 +3493,7 @@ void GSRendererHW::Draw() } if (FRAME_TEX0.TBW != 1 || (m_r.width() > frame_psm.pgs.x || m_r.height() > frame_psm.pgs.y)) { + FRAME_TEX0.TBP0 = rt->m_TEX0.TBP0; rt->m_TEX0 = FRAME_TEX0; } @@ -3501,7 +3502,10 @@ void GSRendererHW::Draw() if (ds && (!is_possible_mem_clear || ds->m_TEX0.PSM != ZBUF_TEX0.PSM || (rt && ds->m_TEX0.TBW != rt->m_TEX0.TBW)) && !m_in_target_draw) { if (ZBUF_TEX0.TBW != 1 || (m_r.width() > frame_psm.pgs.x || m_r.height() > frame_psm.pgs.y)) + { + ZBUF_TEX0.TBP0 = ds->m_TEX0.TBP0; ds->m_TEX0 = ZBUF_TEX0; + } } } else if (!m_texture_shuffle) diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp index bb2b60b3fb..4f1f9ed4b3 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp @@ -2073,7 +2073,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(GIFRegTEX0 TEX0, const GSVe // 2. Preserved data will be in the correct place (in most cases) // 3. Less deleting sources/targets // 4. We can basically do clears in hardware, if they aren't insane ones - if (can_use && !is_shuffle && ((preserve_alpha && preserve_rgb) || (draw_rect.w > GSLocalMemory::m_psm[t->m_TEX0.PSM].pgs.y && !possible_clear)) && TEX0.TBW != t->m_TEX0.TBW && t->m_dirty.size() >= 1) + if (can_use && ((!is_shuffle && t->m_dirty.size() >= 1) || (is_shuffle && src && GSLocalMemory::m_psm[src->m_TEX0.PSM].bpp == 8 && GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp == 16)) && ((preserve_alpha && preserve_rgb) || (draw_rect.w > GSLocalMemory::m_psm[t->m_TEX0.PSM].pgs.y && !possible_clear)) && TEX0.TBW != t->m_TEX0.TBW) { can_use = false; } @@ -5321,6 +5321,8 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con sTex, sRectF, dTex, GSVector4(destX, destY, new_size.x, new_size.y), shader, false); } + m_temporary_source = src; + g_perfmon.Put(GSPerfMon::TextureCopies, 1); #ifdef PCSX2_DEVBUILD