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

GS/HW: Calculate alpha on updated areas on RT invalidation

This commit is contained in:
refractionpcsx2 2024-02-26 10:53:01 +00:00
parent f2a614913d
commit de64f784e8
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5901,6 +5901,8 @@ void GSTextureCache::Target::Update()
u32 ndrects = 0; u32 ndrects = 0;
const GSOffset off(g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM)); const GSOffset off(g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM));
std::pair<u8, u8> alpha_minmax = {255, 0};
for (size_t i = 0; i < m_dirty.size(); i++) for (size_t i = 0; i < m_dirty.size(); i++)
{ {
// Don't align the area we write to the target to the block size. If the format matches, the writes don't need // Don't align the area we write to the target to the block size. If the format matches, the writes don't need
@ -5916,6 +5918,17 @@ void GSTextureCache::Target::Update()
const GSVector4i t_r(read_r - t_offset); const GSVector4i t_r(read_r - t_offset);
if (mapped) if (mapped)
{ {
if (m_32_bits_fmt && (m_TEX0.PSM & 0xf) != PSMCT24)
{
// TODO: Only read once in 32bit and copy to the mapped texture. Bit out of scope of this PR and not a huge impact.
const int pitch = VectorAlign(read_r.width() * sizeof(u32));
g_gs_renderer->m_mem.ReadTexture(off, read_r, s_unswizzle_buffer, pitch, TEXA);
std::pair<u8, u8> new_alpha_minmax = GSGetRGBA8AlphaMinMax(s_unswizzle_buffer, read_r.width(), read_r.height(), pitch);
alpha_minmax.first = std::min(alpha_minmax.first, new_alpha_minmax.first);
alpha_minmax.second = std::max(alpha_minmax.second, new_alpha_minmax.second);
}
g_gs_renderer->m_mem.ReadTexture( g_gs_renderer->m_mem.ReadTexture(
off, read_r, m.bits + t_r.y * static_cast<u32>(m.pitch) + (t_r.x * sizeof(u32)), m.pitch, TEXA); off, read_r, m.bits + t_r.y * static_cast<u32>(m.pitch) + (t_r.x * sizeof(u32)), m.pitch, TEXA);
} }
@ -5924,6 +5937,13 @@ void GSTextureCache::Target::Update()
const int pitch = VectorAlign(read_r.width() * sizeof(u32)); const int pitch = VectorAlign(read_r.width() * sizeof(u32));
g_gs_renderer->m_mem.ReadTexture(off, read_r, s_unswizzle_buffer, pitch, TEXA); g_gs_renderer->m_mem.ReadTexture(off, read_r, s_unswizzle_buffer, pitch, TEXA);
if (m_32_bits_fmt && (m_TEX0.PSM & 0xf) != PSMCT24)
{
std::pair<u8, u8> new_alpha_minmax = GSGetRGBA8AlphaMinMax(s_unswizzle_buffer, read_r.width(), read_r.height(), pitch);
alpha_minmax.first = std::min(alpha_minmax.first, new_alpha_minmax.first);
alpha_minmax.second = std::max(alpha_minmax.second, new_alpha_minmax.second);
}
t->Update(t_r, s_unswizzle_buffer, pitch); t->Update(t_r, s_unswizzle_buffer, pitch);
} }
@ -5981,8 +6001,24 @@ void GSTextureCache::Target::Update()
} }
else else
{ {
m_alpha_min = 0; if (m_32_bits_fmt)
m_alpha_max = m_32_bits_fmt ? 255 : 128; {
if (!total_rect.eq(m_valid))
{
m_alpha_min = std::min(static_cast<int>(alpha_minmax.first), m_alpha_min);
m_alpha_max = std::max(static_cast<int>(alpha_minmax.second), m_alpha_max);
}
else
{
m_alpha_min = alpha_minmax.first;
m_alpha_max = alpha_minmax.second;
}
}
else
{
m_alpha_min = 0;
m_alpha_max = 128;
}
} }
g_gs_device->Recycle(t); g_gs_device->Recycle(t);
m_dirty.clear(); m_dirty.clear();