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

GIF: Modify fifo read behaviour 

Fixes some glitching in Need for Speed Underground 2
This commit is contained in:
refractionpcsx2 2021-11-20 19:31:32 +00:00
parent b8a2cd1b06
commit fe85fc9d25
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcsx2/Gif.cpp
View File

@ -282,10 +282,7 @@ __fi void gifInterrupt()
// If we just read from the fifo, we want to loop and not read more DMA // If we just read from the fifo, we want to loop and not read more DMA
// If there is no DMA data waiting and the DMA is active, let the DMA progress until there is // If there is no DMA data waiting and the DMA is active, let the DMA progress until there is
if ((!CheckPaths() && gif_fifo.fifoSize == 16) || readSize) if ((!CheckPaths() && gif_fifo.fifoSize == 16) || readSize)
{ return;
if (gifch.qwc || !gifch.chcr.STR)
return;
}
} }
if (!(gifch.chcr.STR)) if (!(gifch.chcr.STR))
@ -751,27 +748,6 @@ void gifMFIFOInterrupt()
return; return;
} }
gifCheckPathStatus(false);
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);
// Make sure it loops if the GIF packet is empty to prepare for the next packet
// or end if it was the end of a packet.
// This must trigger after VIF retriggers as VIf might instantly mask Path3
if (!gifUnit.Path3Masked() || gifch.qwc == 0)
{
GifDMAInt(16);
}
return;
}
}
// If there's something in the FIFO and we can do PATH3, empty the FIFO. // If there's something in the FIFO and we can do PATH3, empty the FIFO.
if (gif_fifo.fifoSize > 0) if (gif_fifo.fifoSize > 0)
{ {
@ -785,10 +761,7 @@ void gifMFIFOInterrupt()
// If we just read from the fifo, we want to loop and not read more DMA // If we just read from the fifo, we want to loop and not read more DMA
// If there is no DMA data waiting and the DMA is active, let the DMA progress until there is // If there is no DMA data waiting and the DMA is active, let the DMA progress until there is
if ((!CheckPaths() && gif_fifo.fifoSize == 16) || readSize) if ((!CheckPaths() && gif_fifo.fifoSize == 16) || readSize)
{ return;
if (gifch.qwc || !gifch.chcr.STR)
return;
}
} }
if (!gifch.chcr.STR) if (!gifch.chcr.STR)
@ -805,7 +778,6 @@ void gifMFIFOInterrupt()
if (gifch.qwc > 0 || !gif.gspath3done) if (gifch.qwc > 0 || !gif.gspath3done)
{ {
mfifoGIFtransfer(); mfifoGIFtransfer();
return; return;
} }