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

GS-HW: Increase channel shuffle sizes to resolution or higher. 

GS-TC: Fix small bug which could end up with an invalidation being skipped.
This commit is contained in:
refractionpcsx2 2022-11-14 11:36:38 +00:00
parent 433e42e3e4
commit cfb5e203b3
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
View File

@ -823,11 +823,24 @@ GSVector2i GSRendererHW::GetTargetSize(GSVector2i* unscaled_size)
}
}
u32 width = m_context->FRAME.FBW * 64u;
// If it's a channel shuffle, it'll likely be just a single page, so assume full screen.
if (m_channel_shuffle)
{
const int page_x = GSLocalMemory::m_psm[m_context->FRAME.PSM].pgs.x - 1;
const int page_y = GSLocalMemory::m_psm[m_context->FRAME.PSM].pgs.y - 1;
// Round up the page as channel shuffles are generally done in pages at a time
width = (std::max(static_cast<u32>(GetResolution().x), width) + page_x) & ~page_x;
min_height = (std::max(static_cast<u32>(GetResolution().y), min_height) + page_y) & ~page_y;
}
// Align to even lines, reduces the chance of tiny resizes.
min_height = Common::AlignUpPow2(min_height, 2);
const u32 width = m_context->FRAME.FBW * 64u;
const u32 height = m_tc->GetTargetHeight(m_context->FRAME.FBP, m_context->FRAME.FBW, m_context->FRAME.PSM, min_height);
u32 height = m_tc->GetTargetHeight(m_context->FRAME.FBP, m_context->FRAME.FBW, m_context->FRAME.PSM, min_height);
if (unscaled_size)
{
unscaled_size->x = static_cast<int>(width);
@ -1705,8 +1718,8 @@ void GSRendererHW::Draw()
{
// We still need to make sure the dimensions of the targets match.
const GSVector2 up_s(GetTextureScaleFactor());
const int new_w = std::max(t_size.x, std::max(rt ? rt->m_texture->GetWidth() : 0, ds ? ds->m_texture->GetWidth() : 0));
const int new_h = std::max(t_size.y, std::max(rt ? rt->m_texture->GetHeight() : 0, ds ? ds->m_texture->GetHeight() : 0));
int new_w = std::max(t_size.x, std::max(rt ? rt->m_texture->GetWidth() : 0, ds ? ds->m_texture->GetWidth() : 0));
int new_h = std::max(t_size.y, std::max(rt ? rt->m_texture->GetHeight() : 0, ds ? ds->m_texture->GetHeight() : 0));
if (rt)
{

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

@ -880,7 +880,7 @@ void GSTextureCache::InvalidateVideoMem(const GSOffset& off, const GSVector4i& r
auto& list = m_dst[type];
for (auto i = list.begin(); i != list.end();)
{
auto j = i++;
auto j = i;
Target* t = *j;
// GH: (I think) this code is completely broken. Typical issue:
@ -935,12 +935,14 @@ void GSTextureCache::InvalidateVideoMem(const GSOffset& off, const GSVector4i& r
}
if (!ComputeSurfaceOffset(off, r, t).is_valid)
{
list.erase(j);
i = list.erase(j);
GL_CACHE("TC: Remove Target(%s) %d (0x%x)", to_string(type),
t->m_texture ? t->m_texture->GetID() : 0,
t->m_TEX0.TBP0);
delete t;
}
else
i++;
continue;
}
}
@ -953,6 +955,8 @@ void GSTextureCache::InvalidateVideoMem(const GSOffset& off, const GSVector4i& r
t->m_dirty_alpha = false;
}
i++;
// GH: Try to detect texture write that will overlap with a target buffer
// TODO Use ComputeSurfaceOffset below.
if (GSUtil::HasSharedBits(psm, t->m_TEX0.PSM))