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

zzogl-pg: Minor fix from my last commit. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3385 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-07-04 10:53:41 +00:00
parent 28ae87c5f7
commit cc06570bd4
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/zzogl-pg/opengl/GifTransfer.cpp
View File

@ -120,16 +120,18 @@ template<int index> void _GSgifTransfer(u32 *pMem, u32 size)
{ {
GIFPackedRegHandlerA_D(pMem); GIFPackedRegHandlerA_D(pMem);
pMem += sizeof(GIFPackedReg); pMem += 4; //sizeof(GIFPackedReg)/4;
} }
while(--path->nloop > 0); while(--path->nloop > 0);
break;
} }
do do
{ {
g_GIFPackedRegHandlers[path->GetReg()](pMem); u32 reg = path->GetReg();
g_GIFPackedRegHandlers[reg](pMem);
pMem += 4; pMem += 4; //sizeof(GIFPackedReg)/4;
size--; size--;
} }
while (path->StepReg() && (size > 0)); while (path->StepReg() && (size > 0));

2
plugins/zzogl-pg/opengl/GifTransfer.h
View File

@ -93,7 +93,7 @@ typedef struct
if (nreg == 0) nreg = 64; if (nreg == 0) nreg = 64;
regs = tag.REGS; regs = tag.REGS;
reg = 0; reg = 0;
if ((nreg == 4) && (regs == GIF_REG_A_D)) adonly == true; if ((nreg == 4) && (regs == GIF_REG_A_D)) adonly = true;
// ZZLog::GS_Log("GIFtag: %8.8lx_%8.8lx_%8.8lx_%8.8lx: EOP=%d, NLOOP=%x, FLG=%x, NREG=%d, PRE=%d", // ZZLog::GS_Log("GIFtag: %8.8lx_%8.8lx_%8.8lx_%8.8lx: EOP=%d, NLOOP=%x, FLG=%x, NREG=%d, PRE=%d",
// data[3], data[2], data[1], data[0], // data[3], data[2], data[1], data[0],

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

@ -3808,7 +3808,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo
{ {
case PSMCT32: case PSMCT32:
case PSMCT24: case PSMCT24:
RESOLVE_32_BIT(32, u32, u32, (u32)); RESOLVE_32_BIT(32, u32, u32, (u32));
break; break;
@ -3822,7 +3821,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo
break; break;
case PSMT32Z: case PSMT32Z:
case PSMT24Z: case PSMT24Z:
RESOLVE_32_BIT(32Z, u32, u32, (u32)); RESOLVE_32_BIT(32Z, u32, u32, (u32));
break; break;
@ -3842,7 +3840,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo
{ {
case PSMCT32: case PSMCT32:
case PSMCT24: case PSMCT24:
RESOLVE_32_BIT(32, u32, Vector_16F, Float16ToARGB); RESOLVE_32_BIT(32, u32, Vector_16F, Float16ToARGB);
break; break;
@ -3856,7 +3853,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo
break; break;
case PSMT32Z: case PSMT32Z:
case PSMT24Z: case PSMT24Z:
RESOLVE_32_BIT(32Z, u32, Vector_16F, Float16ToARGB_Z); RESOLVE_32_BIT(32Z, u32, Vector_16F, Float16ToARGB_Z);
break; break;