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

GS/HW: Rename IsBlendedOrOpaque() to IsDiscardingDstColor() 

And remove the dst color output case, this is clearly wrong when we're
using this to try to identify clears.
This commit is contained in:
Stenzek 2023-06-03 23:08:49 +10:00 committed by refractionpcsx2
parent c44b4c3d35
commit ba3a7fc11a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1797,7 +1797,7 @@ void GSRendererHW::Draw()
// on. So, instead, let the draw go through with the expanded rectangle, and copy color->depth.
const bool is_zero_clear = (((GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].fmt == 0) ?
m_vertex.buff[1].RGBAQ.U32[0] :
(m_vertex.buff[1].RGBAQ.U32[0] & ~0xFF000000)) == 0) && m_cached_ctx.FRAME.FBMSK == 0 && IsBlendedOrOpaque();
(m_vertex.buff[1].RGBAQ.U32[0] & ~0xFF000000)) == 0) && m_cached_ctx.FRAME.FBMSK == 0 && IsDiscardingDstColor();
const bool req_z = m_cached_ctx.FRAME.FBP != m_cached_ctx.ZBUF.ZBP && !m_cached_ctx.ZBUF.ZMSK;
bool no_target_found = false;
@ -2388,7 +2388,7 @@ void GSRendererHW::Draw()
return;
}
if (!GSConfig.UserHacks_DisableSafeFeatures && is_possible_mem_clear && IsBlendedOrOpaque())
if (!GSConfig.UserHacks_DisableSafeFeatures && is_possible_mem_clear && IsDiscardingDstColor())
OI_DoubleHalfClear(rt, ds);
// A couple of hack to avoid upscaling issue. So far it seems to impacts mostly sprite
@ -5432,9 +5432,11 @@ bool GSRendererHW::OI_BlitFMV(GSTextureCache::Target* _rt, GSTextureCache::Sourc
// Nothing to see keep going
return true;
}
bool GSRendererHW::IsBlendedOrOpaque()
bool GSRendererHW::IsDiscardingDstColor()
{
return (!PRIM->ABE || IsOpaque() || m_context->ALPHA.IsCdOutput());
return (!PRIM->ABE || IsOpaque() || m_context->ALPHA.IsBlack()) && !m_cached_ctx.TEST.ATE &&
!m_cached_ctx.TEST.DATE;
}
bool GSRendererHW::PrimitiveCoversWithoutGaps() const

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

@ -54,7 +54,7 @@ private:
void SwSpriteRender();
bool CanUseSwSpriteRender();
bool IsConstantDirectWriteMemClear();
bool IsBlendedOrOpaque();
bool IsDiscardingDstColor();
bool PrimitiveCoversWithoutGaps() const;
enum class CLUTDrawTestResult