From cc06570bd40b385c206c0a6b93cd4258d41f7326 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 4 Jul 2010 10:53:41 +0000 Subject: [PATCH] zzogl-pg: Minor fix from my last commit. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3385 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/GifTransfer.cpp | 10 ++++++---- plugins/zzogl-pg/opengl/GifTransfer.h | 2 +- plugins/zzogl-pg/opengl/targets.cpp | 4 ---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/zzogl-pg/opengl/GifTransfer.cpp b/plugins/zzogl-pg/opengl/GifTransfer.cpp index 47f762bbf7..7f7ca2d7d3 100644 --- a/plugins/zzogl-pg/opengl/GifTransfer.cpp +++ b/plugins/zzogl-pg/opengl/GifTransfer.cpp @@ -120,16 +120,18 @@ template void _GSgifTransfer(u32 *pMem, u32 size) { GIFPackedRegHandlerA_D(pMem); - pMem += sizeof(GIFPackedReg); + pMem += 4; //sizeof(GIFPackedReg)/4; } while(--path->nloop > 0); + break; } do { - g_GIFPackedRegHandlers[path->GetReg()](pMem); - - pMem += 4; + u32 reg = path->GetReg(); + g_GIFPackedRegHandlers[reg](pMem); + + pMem += 4; //sizeof(GIFPackedReg)/4; size--; } while (path->StepReg() && (size > 0)); diff --git a/plugins/zzogl-pg/opengl/GifTransfer.h b/plugins/zzogl-pg/opengl/GifTransfer.h index 9cc6148dc4..0ce7b48e52 100644 --- a/plugins/zzogl-pg/opengl/GifTransfer.h +++ b/plugins/zzogl-pg/opengl/GifTransfer.h @@ -93,7 +93,7 @@ typedef struct if (nreg == 0) nreg = 64; regs = tag.REGS; 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", // data[3], data[2], data[1], data[0], diff --git a/plugins/zzogl-pg/opengl/targets.cpp b/plugins/zzogl-pg/opengl/targets.cpp index 2701503522..5593c7aadf 100644 --- a/plugins/zzogl-pg/opengl/targets.cpp +++ b/plugins/zzogl-pg/opengl/targets.cpp @@ -3808,7 +3808,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo { case PSMCT32: - case PSMCT24: RESOLVE_32_BIT(32, u32, u32, (u32)); break; @@ -3822,7 +3821,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo break; case PSMT32Z: - case PSMT24Z: RESOLVE_32_BIT(32Z, u32, u32, (u32)); break; @@ -3842,7 +3840,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo { case PSMCT32: - case PSMCT24: RESOLVE_32_BIT(32, u32, Vector_16F, Float16ToARGB); break; @@ -3856,7 +3853,6 @@ void _Resolve(const void* psrc, int fbp, int fbw, int fbh, int psm, u32 fbm, boo break; case PSMT32Z: - case PSMT24Z: RESOLVE_32_BIT(32Z, u32, Vector_16F, Float16ToARGB_Z); break;