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

GIF: Time transfers from FIFO correctly. 

Will break FIFA Street 2 / FIFA 2005 but they can be fixed with GIF FIFO Gamefix + Cycle Rate + 3
This commit is contained in:
refractionpcsx2 2021-10-28 20:02:35 +01:00
parent 23283b7f0a
commit 3ac86a19ff
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pcsx2/Gif.cpp
View File

@ -193,10 +193,16 @@ __fi void gifCheckPathStatus(bool calledFromGIF)
GifDMAInt(16);
return;
}
// Required for Path3 Masking timing!
if (gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_WAIT)
gifUnit.gifPath[GIF_PATH_3].state = GIF_PATH_IDLE;
if (gifRegs.stat.APATH == 3)
{
gifRegs.stat.APATH = 0;
gifRegs.stat.OPH = 0;
if (!calledFromGIF && (gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_IDLE || gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_WAIT))
{
if (gifUnit.checkPaths(1, 1, 0))
@ -204,10 +210,6 @@ __fi void gifCheckPathStatus(bool calledFromGIF)
}
}
// Required for Path3 Masking timing!
if (gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_WAIT)
gifUnit.gifPath[GIF_PATH_3].state = GIF_PATH_IDLE;
// GIF DMA isn't running but VIF might be waiting on PATH3 so resume it here
if (calledFromGIF && gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_IDLE)
{
@ -275,19 +277,6 @@ __fi void gifInterrupt()
if (readSize)
GifDMAInt(readSize * BIAS);
gifCheckPathStatus(false);
// Double check as we might have read the fifo as it's ending the DMA
if (gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_IDLE)
{
if (vif1Regs.stat.VGW)
{
// Check if VIF is in a cycle or is currently "idle" waiting for GIF to come back.
if (!(cpuRegs.interrupt & (1 << DMAC_VIF1)))
{
CPU_INT(DMAC_VIF1, 1);
}
}
}
// The following is quite timing sensitive so we need to pause/resume the DMA in these certain scenarios
// If the DMA is masked/blocked and the fifo is full, no need to run the DMA
// If we just read from the fifo, we want to loop and not read more DMA
@ -791,20 +780,6 @@ void gifMFIFOInterrupt()
if (readSize)
GifDMAInt(readSize * BIAS);
gifCheckPathStatus(false);
// Double check as we might have read the fifo as it's ending the DMA
if (gifUnit.gifPath[GIF_PATH_3].state == GIF_PATH_IDLE)
{
if (vif1Regs.stat.VGW)
{
//Check if VIF is in a cycle or is currently "idle" waiting for GIF to come back.
if (!(cpuRegs.interrupt & (1 << DMAC_VIF1)))
{
CPU_INT(DMAC_VIF1, 1);
}
}
}
// The following is quite timing sensitive so we need to pause/resume the DMA in these certain scenarios
// If the DMA is masked/blocked and the fifo is full, no need to run the DMA
// If we just read from the fifo, we want to loop and not read more DMA