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

pcsx2: A few misc changes. && != &. zzogl-pg: Comment out a log message that was spamming in Mana Khemia. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2866 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-04-16 05:08:41 +00:00
parent 6d6eb253c6
commit 678f2018d0
5 changed files with 344 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Gif.cpp
View File

@ -75,6 +75,7 @@ __forceinline void gsInterrupt()
return;
}
// Champions: Return to Arms prints this a lot.
if((gif->chcr.MOD == CHAIN_MODE) && ((gif->chcr.TAG >> 12) & 0x7) != 0x0 && ((gif->chcr.TAG >> 12) & 0x7) != 0x7 && !((gif->chcr.TAG >> 12) & 0x8))
DevCon.Warning("GIF Ending when refe or end not set! CHCR = %x", gif->chcr._u32);

24
pcsx2/IPU/IPU.cpp
View File

@ -1249,27 +1249,27 @@ static __forceinline void ipuDmacSrcChain()
switch (IPU1Status.ChainMode)
{
case 0x0: // refe
case TAG_REFE: // refe
//if(IPU1Status.InProgress == false) ipu1dma->tadr += 16;
if(ipu1dma->qwc == 0 && IPU1Status.DMAFinished == false) IPU1Status.DMAFinished = true;
break;
case 0x1: // cnt
case TAG_CNT: // cnt
// Set the taddr to the next tag
ipu1dma->tadr = ipu1dma->madr;
if(ipu1dma->qwc == 0 && IPU1Status.DMAFinished == false) IPU1Status.DMAFinished = false;
break;
case 0x2: // next
case TAG_NEXT: // next
ipu1dma->tadr = IPU1Status.NextMem;
if(ipu1dma->qwc == 0 && IPU1Status.DMAFinished == false) IPU1Status.DMAFinished = false;
break;
case 0x3: // ref
case TAG_REF: // ref
//if(IPU1Status.InProgress == false)ipu1dma->tadr += 16;
if(ipu1dma->qwc == 0 && IPU1Status.DMAFinished == false) IPU1Status.DMAFinished = false;
break;
case 0x7: // end
case TAG_END: // end
ipu1dma->tadr = ipu1dma->madr;
if(ipu1dma->qwc == 0 && IPU1Status.DMAFinished == false) IPU1Status.DMAFinished = true;
break;
@ -1418,7 +1418,7 @@ int IPU1dma()
switch (IPU1Status.ChainMode)
{
case 0x0: // refe
case TAG_REFE: // refe
// do not change tadr
//ipu1dma->tadr += 16;
ipu1dma->tadr += 16;
@ -1427,7 +1427,7 @@ int IPU1dma()
break;
case 0x1: // cnt
case TAG_CNT: // cnt
ipu1dma->madr = ipu1dma->tadr + 16;
IPU_LOG("Tag should end on %x", ipu1dma->madr + ipu1dma->qwc * 16);
//ipu1dma->tadr = ipu1dma->madr + (ipu1dma->qwc * 16);
@ -1435,21 +1435,21 @@ int IPU1dma()
//IPU1Status.DMAFinished = false;
break;
case 0x2: // next
case TAG_NEXT: // next
ipu1dma->madr = ipu1dma->tadr + 16;
IPU1Status.NextMem = ptag[1];
IPU_LOG("Tag should end on %x", IPU1Status.NextMem);
//IPU1Status.DMAFinished = false;
break;
case 0x3: // ref
case TAG_REF: // ref
ipu1dma->madr = ptag[1];
ipu1dma->tadr += 16;
IPU_LOG("Tag should end on %x", ipu1dma->tadr);
//IPU1Status.DMAFinished = false;
break;
case 0x7: // end
case TAG_END: // end
// do not change tadr
ipu1dma->madr = ipu1dma->tadr + 16;
ipu1dma->tadr += 16;
@ -1566,7 +1566,7 @@ __forceinline void dmaIPU0() // fromIPU
__forceinline void dmaIPU1() // toIPU
{
IPU_LOG("IPU1DMAStart QWC %x, MADR %x, CHCR %x, TADR %x", ipu1dma->qwc, ipu1dma->madr, ipu1dma->chcr._u32, ipu1dma->tadr);
if(ipu1dma->chcr.MOD == 1) //Chain Mode
if (ipu1dma->chcr.MOD == CHAIN_MODE) //Chain Mode
{
IPU_LOG("Setting up IPU1 Chain mode");
if(ipu1dma->qwc == 0)
@ -1590,7 +1590,7 @@ __forceinline void dmaIPU1() // toIPU
{
if(ipu1dma->qwc == 0)
{
ipu1dma->chcr.STR = 0;
ipu1dma->chcr.STR = false;
// Hack to force stop IPU
ipuRegs->cmd.BUSY = 0;
ipuRegs->ctrl.BUSY = 0;

2
pcsx2/ps2/GIFpath.cpp
View File

@ -452,7 +452,7 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size)
break;
}
}
if (pathidx == GIF_PATH_3 & gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
if (pathidx == GIF_PATH_3 && gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
//GIF_LOG("Path3 end EOP %x NLOOP %x Status %x", tag.EOP, nloop, GSTransferStatus.PTH3);
gif->madr += size * 16;
gif->qwc -= size;

4
plugins/zzogl-pg/opengl/zerogs.cpp
View File

@ -838,8 +838,8 @@ bool IsDirty(u32 highdword, u32 psm, int cld, int cbp)
if (cpsm > 1 || csm)
{
ERROR_LOG("16 bit clut not supported.\n");
// don't support 16bit for now
// Mana Khemia triggers this.
//ERROR_LOG("16 bit clut not supported.\n");
return true;
}