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

GIF: Get rid of assertion with side effects

This commit is contained in:
Stenzek 2023-12-24 22:53:13 +10:00 committed by Connor McLaughlin
parent 8b7c69c4b0
commit 4608579c31
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/Gif_Unit.cpp
View File

@ -86,7 +86,7 @@ bool Gif_HandlerAD(u8* pMem)
return false;
}
bool Gif_HandlerAD_MTVU(u8* pMem)
void Gif_HandlerAD_MTVU(u8* pMem)
{
// Note: Atomic communication is with MTVU.cpp Get_GSChanges
const u8 reg = pMem[8] & 0x7f;
@ -129,7 +129,6 @@ bool Gif_HandlerAD_MTVU(u8* pMem)
{
DevCon.Warning("GIF Handler Debug - Write to unknown register! [reg=%x]", reg);
}
return 0;
}
// Returns true if pcsx2 needed to process the packet...

5
pcsx2/Gif_Unit.h
View File

@ -16,7 +16,7 @@ struct GS_Packet;
extern void Gif_MTGS_Wait(bool isMTVU);
extern void Gif_FinishIRQ();
extern bool Gif_HandlerAD(u8* pMem);
extern bool Gif_HandlerAD_MTVU(u8* pMem);
extern void Gif_HandlerAD_MTVU(u8* pMem);
extern bool Gif_HandlerAD_Debug(u8* pMem);
extern void Gif_AddBlankGSPacket(u32 size, GIF_PATH path);
extern void Gif_AddGSPacketMTVU(GS_Packet& gsPack, GIF_PATH path);
@ -450,7 +450,8 @@ struct Gif_Path
break; // Exit Early
if (gifTag.curReg() == GIF_REG_A_D)
{
pxAssert(!Gif_HandlerAD_MTVU(&buffer[curOffset]));
pxAssertMsg(Gif_HandlerAD_Debug(&buffer[curOffset]), "Unhandled GIF packet");
Gif_HandlerAD_MTVU(&buffer[curOffset]);
}
incTag(curOffset, gsPack.size, 16); // 1 QWC
gifTag.packedStep();