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

GS-hw: Properly enable/disable each channel based on fbmask, adjust fbmask detection when to do blending for 16bit/24bit. 

Optimization.
This commit is contained in:
lightningterror 2022-02-04 23:28:24 +01:00 committed by GitHub
parent f84cb1c9cc
commit 99f0d5c685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/GS/Renderers/HW/GSRendererNew.cpp
View File

@ -301,11 +301,11 @@ void GSRendererNew::EmulateTextureShuffleAndFbmask()
// Don't allow only unused bits on 16bit format to enable fbmask, // Don't allow only unused bits on 16bit format to enable fbmask,
// let's set the mask to 0 in such cases. // let's set the mask to 0 in such cases.
int fbmask = static_cast<int>(m_context->FRAME.FBMSK); int fbmask = static_cast<int>(m_context->FRAME.FBMSK);
if (!(fbmask & 0x80F8F8F8) && fbmask != 0x0 && m_conf.ps.dfmt == 2) const int fbmask_r = m_conf.ps.dfmt == 2 ? 0x80F8F8F8 : m_conf.ps.dfmt == 1 ? 0x00FFFFFF : 0xFFFFFFFF;
fbmask = 0x0; fbmask &= fbmask_r;
const GSVector4i fbmask_v = GSVector4i::load(fbmask); const GSVector4i fbmask_v = GSVector4i::load(fbmask);
const int ff_fbmask = fbmask_v.eq8(GSVector4i::xffffffff()).mask(); const GSVector4i fbmask_vr = GSVector4i::load(fbmask_r);
const int ff_fbmask = fbmask_v.eq8(fbmask_vr).mask();
const int zero_fbmask = fbmask_v.eq8(GSVector4i::zero()).mask(); const int zero_fbmask = fbmask_v.eq8(GSVector4i::zero()).mask();
m_conf.colormask.wrgba = ~ff_fbmask; // Enable channel if at least 1 bit is 0 m_conf.colormask.wrgba = ~ff_fbmask; // Enable channel if at least 1 bit is 0
@ -527,8 +527,9 @@ void GSRendererNew::EmulateBlending(bool& DATE_PRIMID, bool& DATE_BARRIER)
const bool AA1 = PRIM->AA1 && (m_vt.m_primclass == GS_LINE_CLASS); const bool AA1 = PRIM->AA1 && (m_vt.m_primclass == GS_LINE_CLASS);
// PABE: Check condition early as an optimization. // PABE: Check condition early as an optimization.
const bool PABE = PRIM->ABE && m_env.PABE.PABE && (GetAlphaMinMax().max < 128); const bool PABE = PRIM->ABE && m_env.PABE.PABE && (GetAlphaMinMax().max < 128);
// FBMASK: Only alpha is written, no need to do blending. // FBMASK: Color is not written, no need to do blending.
const bool FBMASK = m_context->FRAME.FBMSK == 0x00FFFFFF; const int temp_fbmask = m_conf.ps.dfmt == 2 ? 0x00F8F8F8 : 0x00FFFFFF;
const bool FBMASK = (m_context->FRAME.FBMSK & temp_fbmask) == temp_fbmask;
// No blending or coverage anti-aliasing so early exit // No blending or coverage anti-aliasing so early exit
if (FBMASK || PABE || !(PRIM->ABE || AA1)) if (FBMASK || PABE || !(PRIM->ABE || AA1))