GS: Fix God of War regression from #6389 (v1.7.2937)

This commit is contained in:
refractionpcsx2 2022-06-14 02:12:26 +01:00
parent 9441d2a33a
commit 24c99551c7
1 changed files with 4 additions and 8 deletions

View File

@ -772,8 +772,6 @@ void GSState::GIFPackedRegHandlerUV_Hack(const GIFPackedReg* RESTRICT r)
template <u32 prim, u32 adc, bool auto_flush, bool index_swap> template <u32 prim, u32 adc, bool auto_flush, bool index_swap>
void GSState::GIFPackedRegHandlerXYZF2(const GIFPackedReg* RESTRICT r) void GSState::GIFPackedRegHandlerXYZF2(const GIFPackedReg* RESTRICT r)
{ {
const bool skip = adc ? 1 : r->XYZ2.Skip();
if (!skip)
CheckFlushes(); CheckFlushes();
GSVector4i xy = GSVector4i::loadl(&r->U64[0]); GSVector4i xy = GSVector4i::loadl(&r->U64[0]);
@ -784,14 +782,12 @@ void GSState::GIFPackedRegHandlerXYZF2(const GIFPackedReg* RESTRICT r)
m_v.m[1] = xy.upl32(zf); m_v.m[1] = xy.upl32(zf);
VertexKick<prim, auto_flush, index_swap>(skip); VertexKick<prim, auto_flush, index_swap>(adc ? 1 : r->XYZ2.Skip());
} }
template <u32 prim, u32 adc, bool auto_flush, bool index_swap> template <u32 prim, u32 adc, bool auto_flush, bool index_swap>
void GSState::GIFPackedRegHandlerXYZ2(const GIFPackedReg* RESTRICT r) void GSState::GIFPackedRegHandlerXYZ2(const GIFPackedReg* RESTRICT r)
{ {
const bool skip = adc ? 1 : r->XYZ2.Skip();
if(!skip)
CheckFlushes(); CheckFlushes();
const GSVector4i xy = GSVector4i::loadl(&r->U64[0]); const GSVector4i xy = GSVector4i::loadl(&r->U64[0]);
@ -800,7 +796,7 @@ void GSState::GIFPackedRegHandlerXYZ2(const GIFPackedReg* RESTRICT r)
m_v.m[1] = xyz.upl64(GSVector4i::loadl(&m_v.UV)); m_v.m[1] = xyz.upl64(GSVector4i::loadl(&m_v.UV));
VertexKick<prim, auto_flush, index_swap>(skip); VertexKick<prim, auto_flush, index_swap>(adc ? 1 : r->XYZ2.Skip());
} }
void GSState::GIFPackedRegHandlerFOG(const GIFPackedReg* RESTRICT r) void GSState::GIFPackedRegHandlerFOG(const GIFPackedReg* RESTRICT r)