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

GS/HW: Cache possible mem clear value

This commit is contained in:
Stenzek 2023-04-28 18:06:38 +10:00 committed by refractionpcsx2
parent ec41af760a
commit 0822d3e3e5
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/Renderers/HW/GSHwHack.cpp
View File

@ -1111,7 +1111,7 @@ bool GSHwHack::OI_HauntingGround(GSRendererHW& r, GSTexture* rt, GSTexture* ds,
{ {
// Haunting Ground clears two targets by doing a 256x448 direct colour write at 0x3000, covering a target at 0x3380. // Haunting Ground clears two targets by doing a 256x448 direct colour write at 0x3000, covering a target at 0x3380.
// This currently isn't handled in our HLE clears, so we need to manually remove the other target. // This currently isn't handled in our HLE clears, so we need to manually remove the other target.
if (rt && !ds && !t && r.IsConstantDirectWriteMemClear(true)) if (rt && !ds && !t && r.IsConstantDirectWriteMemClear())
{ {
GL_CACHE("GSHwHack::OI_HauntingGround()"); GL_CACHE("GSHwHack::OI_HauntingGround()");
g_texture_cache->InvalidateVideoMemTargets(GSTextureCache::RenderTarget, RFRAME.Block(), RFRAME.FBW, RFRAME.PSM, r.m_r); g_texture_cache->InvalidateVideoMemTargets(GSTextureCache::RenderTarget, RFRAME.Block(), RFRAME.FBW, RFRAME.PSM, r.m_r);

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

@ -1623,9 +1623,11 @@ void GSRendererHW::Draw()
cleanup_draw(); cleanup_draw();
}; };
const bool is_possible_mem_clear = IsConstantDirectWriteMemClear();
if (!GSConfig.UserHacks_DisableSafeFeatures) if (!GSConfig.UserHacks_DisableSafeFeatures)
{ {
if (IsConstantDirectWriteMemClear(true)) if (is_possible_mem_clear)
{ {
// Likely doing a huge single page width clear, which never goes well. (Superman) // Likely doing a huge single page width clear, which never goes well. (Superman)
// Burnout 3 does a 32x1024 double width clear on its reflection targets. // Burnout 3 does a 32x1024 double width clear on its reflection targets.
@ -1832,7 +1834,7 @@ void GSRendererHW::Draw()
// create that target, because the clear isn't black, it'll hang around and never get invalidated. // create that target, because the clear isn't black, it'll hang around and never get invalidated.
const bool is_square = (t_size.y == t_size.x) && m_r.w >= 1023 && const bool is_square = (t_size.y == t_size.x) && m_r.w >= 1023 &&
((m_index.tail == 2 && m_vt.m_primclass == GS_SPRITE_CLASS) || (m_index.tail == 6 && m_vt.m_primclass == GS_TRIANGLE_CLASS)); ((m_index.tail == 2 && m_vt.m_primclass == GS_SPRITE_CLASS) || (m_index.tail == 6 && m_vt.m_primclass == GS_TRIANGLE_CLASS));
const bool is_clear = IsConstantDirectWriteMemClear(false) && is_square; const bool is_clear = is_possible_mem_clear && is_square;
rt = g_texture_cache->LookupTarget(FRAME_TEX0, t_size, target_scale, GSTextureCache::RenderTarget, true, rt = g_texture_cache->LookupTarget(FRAME_TEX0, t_size, target_scale, GSTextureCache::RenderTarget, true,
fm, false, is_clear, force_preload); fm, false, is_clear, force_preload);
@ -2025,8 +2027,7 @@ void GSRendererHW::Draw()
// Deferred update of TEX0. We don't want to change it when we're doing a shuffle/clear, because it // Deferred update of TEX0. We don't want to change it when we're doing a shuffle/clear, because it
// may increase the buffer width, or change PSM, which breaks P8 conversion amongst other things. // may increase the buffer width, or change PSM, which breaks P8 conversion amongst other things.
const bool is_mem_clear = IsConstantDirectWriteMemClear(false); const bool can_update_size = !is_possible_mem_clear && !m_texture_shuffle && !m_channel_shuffle;
const bool can_update_size = !is_mem_clear && !m_texture_shuffle && !m_channel_shuffle;
if (!m_texture_shuffle && !m_channel_shuffle) if (!m_texture_shuffle && !m_channel_shuffle)
{ {
if (rt) if (rt)
@ -2203,13 +2204,8 @@ void GSRendererHW::Draw()
return; return;
} }
if (!GSConfig.UserHacks_DisableSafeFeatures) if (!GSConfig.UserHacks_DisableSafeFeatures && is_possible_mem_clear && IsBlendedOrOpaque())
{ OI_DoubleHalfClear(rt, ds);
if (IsConstantDirectWriteMemClear(true) && IsBlendedOrOpaque())
{
OI_DoubleHalfClear(rt, ds);
}
}
// A couple of hack to avoid upscaling issue. So far it seems to impacts mostly sprite // A couple of hack to avoid upscaling issue. So far it seems to impacts mostly sprite
// Note: first hack corrects both position and texture coordinate // Note: first hack corrects both position and texture coordinate
@ -5195,7 +5191,7 @@ bool GSRendererHW::IsBlendedOrOpaque()
return (!PRIM->ABE || IsOpaque() || m_context->ALPHA.IsCdOutput()); return (!PRIM->ABE || IsOpaque() || m_context->ALPHA.IsCdOutput());
} }
bool GSRendererHW::IsConstantDirectWriteMemClear(bool include_zero) bool GSRendererHW::IsConstantDirectWriteMemClear()
{ {
const bool direct_draw = (m_vt.m_primclass == GS_SPRITE_CLASS) || (m_index.tail == 6 && m_vt.m_primclass == GS_TRIANGLE_CLASS); const bool direct_draw = (m_vt.m_primclass == GS_SPRITE_CLASS) || (m_index.tail == 6 && m_vt.m_primclass == GS_TRIANGLE_CLASS);
// Constant Direct Write without texture/test/blending (aka a GS mem clear) // Constant Direct Write without texture/test/blending (aka a GS mem clear)

2
pcsx2/GS/Renderers/HW/GSRendererHW.h
View File

@ -52,7 +52,7 @@ private:
float alpha1(int L, int X0, int X1); float alpha1(int L, int X0, int X1);
void SwSpriteRender(); void SwSpriteRender();
bool CanUseSwSpriteRender(); bool CanUseSwSpriteRender();
bool IsConstantDirectWriteMemClear(bool include_zero); bool IsConstantDirectWriteMemClear();
bool IsBlendedOrOpaque(); bool IsBlendedOrOpaque();
enum class CLUTDrawTestResult enum class CLUTDrawTestResult