From f712c5c6d092b187558b519d6e7b88fa117df997 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Thu, 5 May 2016 12:17:57 +0200 Subject: [PATCH] gsdx tc: use GSLocalMemory::m_psm instead of hardcoded value --- plugins/GSdx/GSRendererHW.cpp | 7 +++++- plugins/GSdx/GSTextureCache.cpp | 40 ++++++++------------------------- plugins/GSdx/GSTextureCache.h | 2 +- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/GSRendererHW.cpp index 8916b52321..76b72683fb 100644 --- a/plugins/GSdx/GSRendererHW.cpp +++ b/plugins/GSdx/GSRendererHW.cpp @@ -182,8 +182,13 @@ GSTexture* GSRendererHW::GetOutput(int i, int& y_offset) int delta = TEX0.TBP0 - rt->m_TEX0.TBP0; if (delta > 0) { + // Code was corrected to use generic format. But I'm not sure behavior is correct. + // Let's keep the warning to easily spot game that trigger this code path. ASSERT(DISPFB.PSM == PSM_PSMCT32 || DISPFB.PSM == PSM_PSMCT24); - y_offset = delta / DISPFB.FBW; + + int pages = delta >> 5u; + int y_pages = pages / DISPFB.FBW; + y_offset = y_pages * GSLocalMemory::m_psm[DISPFB.PSM].pgs.y; GL_CACHE("Frame y offset %d pixels, unit %d", y_offset, i); } diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp index 4e5a0fe9d7..5f6d6815aa 100644 --- a/plugins/GSdx/GSTextureCache.cpp +++ b/plugins/GSdx/GSTextureCache.cpp @@ -363,6 +363,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int w, int h, int type, bool used) { + const GSLocalMemory::psm_t& psm_s = GSLocalMemory::m_psm[TEX0.PSM]; uint32 bp = TEX0.TBP0; Target* dst = NULL; @@ -377,7 +378,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int dst = t; - dst->m_32_bits_fmt |= (GSLocalMemory::m_psm[TEX0.PSM].bpp != 16); + dst->m_32_bits_fmt |= (psm_s.bpp != 16); dst->m_TEX0 = TEX0; break; @@ -389,7 +390,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int dst->Update(); - dst->m_dirty_alpha |= (TEX0.PSM != PSM_PSMCT24) && (TEX0.PSM != PSM_PSMZ24); + dst->m_dirty_alpha |= (psm_s.bpp != 24); } else if (CanConvertDepth()) { @@ -410,10 +411,10 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int dst->m_32_bits_fmt = t->m_32_bits_fmt; int shader; - bool fmt_16_bits = (GSLocalMemory::m_psm[TEX0.PSM].bpp == 16 && GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp == 16); + bool fmt_16_bits = (psm_s.bpp == 16 && GSLocalMemory::m_psm[t->m_TEX0.PSM].bpp == 16); if (type == DepthStencil) { GL_CACHE("TC: Lookup Target(Depth) %dx%d, hit Color (0x%x, F:0x%x was F:0x%x)", w, h, bp, TEX0.PSM, t->m_TEX0.PSM); - shader = (fmt_16_bits) ? ShaderConvert_RGB5A1_TO_FLOAT16 : ShaderConvert_RGBA8_TO_FLOAT32 + GSLocalMemory::m_psm[TEX0.PSM].fmt; + shader = (fmt_16_bits) ? ShaderConvert_RGB5A1_TO_FLOAT16 : ShaderConvert_RGBA8_TO_FLOAT32 + psm_s.fmt; } else { GL_CACHE("TC: Lookup Target(Color) %dx%d, hit Depth (0x%x, F:0x%x was F:0x%x)", w, h, bp, TEX0.PSM, t->m_TEX0.PSM); shader = (fmt_16_bits) ? ShaderConvert_FLOAT16_TO_RGB5A1 : ShaderConvert_FLOAT32_TO_RGBA8; @@ -833,28 +834,9 @@ void GSTextureCache::InvalidateVideoMem(GSOffset* off, const GSVector4i& rect, b } // FIXME: this code "fixes" black FMV issue with rule of rose. - // Code is completely hardcoded so maybe not the best solution. Besides I don't - // know the full impact of it. - // Let's keep this code for the future -#if 0 - if(GSUtil::HasSharedBits(psm, t->m_TEX0.PSM) && (t->m_TEX0.TBP0 + 0x200 == bp)) - { - GL_CACHE("TC: Dirty in the middle of Target(%s) %d (0x%x)", to_string(type), - t->m_texture ? t->m_texture->GetID() : 0, - t->m_TEX0.TBP0); - - uint32 rowsize = bw * 8192u; - uint32 offset = 0x200 * 256u; - int y = GSLocalMemory::m_psm[psm].pgs.y * offset / rowsize; - - t->m_dirty.push_back(GSDirtyRect(GSVector4i(r.left, r.top + y, r.right, r.bottom + y), psm)); - t->m_TEX0.TBW = bw; - continue; - } -#endif #if 1 // Greg: I'm not sure the 'bw' equality is required but it won't hurt too much - if (t->m_TEX0.TBW == bw && t->Inside(bp, psm, rect)) { + if (t->m_TEX0.TBW == bw && t->Inside(bp, bw, psm, rect)) { uint32 rowsize = bw * 8192u; uint32 offset = (uint32)((bp - t->m_TEX0.TBP0) * 256); @@ -1851,15 +1833,11 @@ void GSTextureCache::Target::UpdateValidity(const GSVector4i& rect) //fprintf(stderr, "S: 0x%x E:0x%x\n", m_TEX0.TBP0, m_end_block); } -bool GSTextureCache::Target::Inside(uint32 bp, uint32 psm, const GSVector4i& rect) +bool GSTextureCache::Target::Inside(uint32 bp, uint32 bw, uint32 psm, const GSVector4i& rect) { - uint32 nb_block = rect.height() * rect.width(); - if (m_TEX0.PSM == PSM_PSMCT16) - nb_block >>= 7; - else - nb_block >>= 6; + uint32 block = GSLocalMemory::m_psm[psm].bn(rect.x, rect.y, bp, bw); - return bp > m_TEX0.TBP0 && (bp + nb_block) < m_end_block; + return bp > m_TEX0.TBP0 && block < m_end_block; } // GSTextureCache::SourceMap diff --git a/plugins/GSdx/GSTextureCache.h b/plugins/GSdx/GSTextureCache.h index 52f0083f30..ad11de242e 100644 --- a/plugins/GSdx/GSTextureCache.h +++ b/plugins/GSdx/GSTextureCache.h @@ -94,7 +94,7 @@ public: Target(GSRenderer* r, const GIFRegTEX0& TEX0, uint8* temp, bool depth_supported); void UpdateValidity(const GSVector4i& rect); - bool Inside(uint32 bp, uint32 psm, const GSVector4i& rect); + bool Inside(uint32 bp, uint32 bw, uint32 psm, const GSVector4i& rect); virtual void Update(); };