From 1fa2c0bf506e24cbc303222408a075dabd635bbb Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Tue, 27 May 2025 20:02:57 +0100 Subject: [PATCH] GS/TC: Replace half right with Tex in RT, only update needed dirty --- pcsx2/GS/Renderers/HW/GSTextureCache.cpp | 58 ++++-------------------- pcsx2/GS/Renderers/HW/GSTextureCache.h | 2 +- 2 files changed, 11 insertions(+), 49 deletions(-) diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp index 9ed1951094..6b0ef8a0ce 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp @@ -1232,7 +1232,6 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const } Target* dst = nullptr; - bool half_right = false; int x_offset = 0; int y_offset = 0; @@ -1437,7 +1436,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const const u32 channel_mask = GSUtil::GetChannelMask(psm); const u32 channels = t->m_dirty.GetDirtyChannels() & channel_mask; - + const bool dirty_overlap = !t->m_dirty.GetTotalRect(t->m_TEX0, t->m_unscaled_size).rintersect(new_rect).rempty(); // If the source is reading the rt, make sure it's big enough. if (!possible_shuffle && t && GSUtil::HasCompatibleBits(psm, t->m_TEX0.PSM)&& real_fmt_match) { @@ -1454,7 +1453,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const ResizeTarget(t, resize_rect, bp, psm, bw); } // If not all channels are clean/dirty or only part of the rect is dirty, we need to update the target. - if (((channels & channel_mask) != channel_mask || partial)) + if (dirty_overlap && ((channels & channel_mask) != channel_mask || partial)) { t->Update(); rect_clean = true; @@ -1639,22 +1638,6 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const } } } - else if ((t->m_TEX0.TBW >= 16) && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0 + t->m_TEX0.TBW * 0x10, t->m_TEX0.PSM)) - { - // Detect half of the render target (fix snow engine game) - // Target Page (8KB) have always a width of 64 pixels - // Half of the Target is TBW/2 pages * 8KB / (1 block * 256B) = 0x10 - if (!t->HasValidBitsForFormat(psm, req_color, req_alpha, t->m_TEX0.TBW == TEX0.TBW) && !(possible_shuffle && GSLocalMemory::m_psm[psm].bpp == 16 && GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp == 32)) - continue; - - half_right = true; - dst = t; - found_t = true; - tex_merge_rt = false; - x_offset = 0; - y_offset = 0; - break; - } // Make sure the texture actually is INSIDE the RT, it's possibly not valid if it isn't. // Also check BP >= TBP, create source isn't equpped to expand it backwards and all data comes from the target. (GH3) else if (GSConfig.UserHacks_TextureInsideRt >= GSTextureInRtMode::InsideTargets && @@ -2003,9 +1986,8 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const #ifdef ENABLE_OGL_DEBUG if (dst) { - GL_CACHE("TC: dst %s hit (%s, OFF <%d,%d>): (0x%x, %s)", + GL_CACHE("TC: dst %s hit (OFF <%d,%d>): (0x%x, %s)", to_string(dst->m_type), - half_right ? "half" : "full", x_offset, y_offset, TEX0.TBP0, @@ -2017,7 +1999,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const } #endif - src = CreateSource(TEX0, TEXA, dst, half_right, x_offset, y_offset, lod, &r, gpu_clut, region); + src = CreateSource(TEX0, TEXA, dst, x_offset, y_offset, lod, &r, gpu_clut, region); if (!src) [[unlikely]] return nullptr; } @@ -5366,7 +5348,7 @@ void GSTextureCache::IncAge() } //Fixme: Several issues in here. Not handling depth stencil, pitch conversion doesnt work. -GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* dst, bool half_right, int x_offset, int y_offset, const GSVector2i* lod, const GSVector4i* src_range, GSTexture* gpu_clut, SourceRegion region) +GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* dst, int x_offset, int y_offset, const GSVector2i* lod, const GSVector4i* src_range, GSTexture* gpu_clut, SourceRegion region) { const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[TEX0.PSM]; Source* src = new Source(TEX0, TEXA); @@ -5404,7 +5386,10 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con const int w = static_cast(std::ceil(scale * tw)); const int h = static_cast(std::ceil(scale * th)); - dst->Update(); + const GSVector4i read_rect = GSVector4i(x_offset, y_offset, x_offset + tw, y_offset + th); + // Do this first as we could be adding in alpha from an upgraded 24bit target. if the rect intersects a dirty area. + if (!dst->m_dirty.empty() && !read_rect.rintersect(dst->m_dirty.GetTotalRect(dst->m_TEX0, dst->m_unscaled_size)).rempty()) + dst->Update(); // If we have a source larger than the target (from tex-in-rt), texelFetch() for target region will return black. if constexpr (force_target_copy) @@ -5683,34 +5668,11 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con const bool use_texture = (shader == ShaderConvert::COPY && !source_rect_empty); GSVector4i region_rect = GSVector4i(0, 0, tw, th); - if (half_right) - { - // You typically hit this code in snow engine game. Dstsize is the size of of Dx/GL RT - // which is set to some arbitrary number. h/w are based on the input texture - // so the only reliable way to find the real size of the target is to use the TBW value. - const int half_width = static_cast(dst->m_TEX0.TBW * (64 / 2)); - if (half_width < dst->m_unscaled_size.x) - { - const int copy_width = std::min(half_width, dst->m_unscaled_size.x - half_width); - region_rect = GSVector4i(half_width, 0, half_width + copy_width, th); - GL_CACHE("TC: Half right fix: %d,%d => %d,%d", region_rect.x, region_rect.y, region_rect.z, region_rect.w); - - sRect = sRect.blend32<5>(GSVector4i(GSVector4(region_rect.rintersect(dst->GetUnscaledRect())) * GSVector4(dst->m_scale))); - new_size.x = sRect.width(); - src->m_unscaled_size.x = copy_width; - } - else - { - DevCon.Error("TC: Invalid half-right copy with width %d from %dx%d texture", half_width * 2, dst->m_unscaled_size.x, dst->m_unscaled_size.y); - } - } - // Assuming everything matches up, instead of copying the target, we can just sample it directly. // It's the same as doing the copy first, except we save GPU time. // TODO: We still need to copy if the TBW is mismatched. Except when TBW <= 1 (Jak 2). const GSVector2i dst_texture_size = dst->m_texture->GetSize(); - if ((!half_right || region_rect.z >= dst->m_unscaled_size.x) && // not a smaller subsample - use_texture && // not reinterpreting the RT + if (use_texture && // not reinterpreting the RT !force_target_copy) { // sample the target directly diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.h b/pcsx2/GS/Renderers/HW/GSTextureCache.h index 603e57973c..a41fbd4114 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.h +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.h @@ -441,7 +441,7 @@ protected: std::unique_ptr m_uint16_download_texture; std::unique_ptr m_uint32_download_texture; - Source* CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* t, bool half_right, int x_offset, int y_offset, const GSVector2i* lod, const GSVector4i* src_range, GSTexture* gpu_clut, SourceRegion region); + Source* CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* t, int x_offset, int y_offset, const GSVector2i* lod, const GSVector4i* src_range, GSTexture* gpu_clut, SourceRegion region); bool PreloadTarget(GIFRegTEX0 TEX0, const GSVector2i& size, const GSVector2i& valid_size, bool is_frame, bool preload, bool preserve_target, const GSVector4i draw_rect, Target* dst, GSTextureCache::Source* src = nullptr);