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

Half revert for earlier commit, didnt really make any difference to GT games anyway, just hoped itd effect path3 masking :P 

Btw, if it doesnt work, Blame Krakatos, he said it does!

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1212 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2009-05-17 12:50:16 +00:00
parent 942e7e9231
commit 1b012e9dd9
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/VifDma.cpp
View File

@ -2019,8 +2019,7 @@ static void Vif1CMDMskPath3() // MSKPATH3
#ifdef GSPATH3FIX
if ((vif1Regs->code >> 15) & 0x1)
{
psHu32(GIF_STAT) |= 0x2;
psHu32(GIF_MODE) |= 0x1;
while ((gif->chcr & 0x100)) //Can be done 2 different ways, depends on the game/company
{
if (!path3hack && !Path3transfer && (gif->qwc == 0)) break;
@ -2030,14 +2029,13 @@ static void Vif1CMDMskPath3() // MSKPATH3
if (path3hack && (gif->qwc == 0)) break; //add games not working with it to elfheader.c to enable this instead
}
psHu32(GIF_STAT) |= 0x2;
}
else
{
// fixme: This is the *only* reason 'transferred' is global. Otherwise it'd be local to Vif1Transfer.
if (gif->chcr & 0x100) CPU_INT(2, (transferred >> 2) * BIAS); // Restart Path3 on its own, time it right!
psHu32(GIF_STAT) &= ~0x2;
psHu32(GIF_MODE) &= ~0x1;
}
#else
if (vif1Regs->mskpath3)
@ -2073,10 +2071,8 @@ static void Vif1CMDFlush() // FLUSH/E/A
while ((gif->chcr & 0x100))
{
if (!Path3transfer && gif->qwc == 0) break;
vif1Regs->stat |= VIF1_STAT_VGW;
break;
}
gsInterrupt();
}
}
vif1.cmd &= ~0x7f;
@ -2490,16 +2486,15 @@ __forceinline void vif1Interrupt()
g_vifCycles = 0;
if((vif1Regs->stat & VIF1_STAT_VGW) &&
((psHu32(GIF_MODE) & 0x1) ? (Path3transfer == true || gif->qwc > 0) : (gif->chcr & 0x100)))
(gif->chcr & 0x100))
{
int delay = 0;
if ((psHu32(GIF_MODE) & 0x1))
delay = min( 8, (int)gif->qwc );
else
delay = gif->qwc * BIAS;
if((psHu32(GIF_MODE) & 0x1)) gsInterrupt();
//else CPU_INT(2, min( 64, (int)gif->qwc ) * BIAS);
CPU_INT(1, delay);
return;