From 57f1e7badb9e4fd316279f87d3c9da122c003050 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 18 Sep 2010 12:20:01 +0000 Subject: [PATCH] GregMiscellaneous: zzogl-pg: Remove path3 hack. git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3798 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/GSmain.cpp | 5 +---- plugins/zzogl-pg/opengl/GifTransfer.cpp | 4 +--- plugins/zzogl-pg/opengl/HostMemory.cpp | 11 ++++++++--- plugins/zzogl-pg/opengl/Linux/Linux.cpp | 2 +- plugins/zzogl-pg/opengl/Util.h | 2 +- plugins/zzogl-pg/opengl/ZZKeyboard.cpp | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp index 0dee0c948d..17f5dbe35c 100644 --- a/plugins/zzogl-pg/opengl/GSmain.cpp +++ b/plugins/zzogl-pg/opengl/GSmain.cpp @@ -153,7 +153,7 @@ void ReportHacks(gameHacks hacks) if (hacks.no_alpha_test) ZZLog::WriteLn("'No alpha test' hack enabled."); if (hacks.disable_mrt_depth) ZZLog::WriteLn("'Disable mrt depth' hack enabled."); if (hacks.args_32_bit) ZZLog::WriteLn("'Args 32 bit' hack enabled."); - if (hacks.path3) ZZLog::WriteLn("'Path3' hack enabled."); + //if (hacks.path3) ZZLog::WriteLn("'Path3' hack enabled."); if (hacks.parallel_context) ZZLog::WriteLn("'Parallel context' hack enabled."); if (hacks.xenosaga_spec) ZZLog::WriteLn("'Xenosaga spec' hack enabled."); if (hacks.partial_pointers) ZZLog::WriteLn("'Partial pointers' hack enabled."); @@ -246,9 +246,6 @@ void CALLBACK GSsetGameCRC(int crc, int options) if (CRCValueChanged && (crc != 0)) { - // Enable Path3 hack for all games - conf.def_hacks.path3 = 1; - for (int i = 0; i < GAME_INFO_INDEX; i++) { if (crc_game_list[i].crc == crc) diff --git a/plugins/zzogl-pg/opengl/GifTransfer.cpp b/plugins/zzogl-pg/opengl/GifTransfer.cpp index af684b88e0..aa15fdd038 100644 --- a/plugins/zzogl-pg/opengl/GifTransfer.cpp +++ b/plugins/zzogl-pg/opengl/GifTransfer.cpp @@ -87,9 +87,7 @@ template void _GSgifTransfer(const u32 *pMem, u32 size) path->setTag(pMem); pMem += 4; size--; - - if ((conf.settings().path3) && (index == 2) && path->eop) nPath3Hack = 1; - + // eeuser 7.2.2. GIFtag: "... when NLOOP is 0, the GIF does not output anything, and // values other than the EOP field are disregarded." if (path->nloop > 0) diff --git a/plugins/zzogl-pg/opengl/HostMemory.cpp b/plugins/zzogl-pg/opengl/HostMemory.cpp index 5527dbd14b..9778f8a9c4 100644 --- a/plugins/zzogl-pg/opengl/HostMemory.cpp +++ b/plugins/zzogl-pg/opengl/HostMemory.cpp @@ -79,6 +79,12 @@ static vector s_vTempBuffer, s_vTransferCache; static int gs_imageEnd = 0; +// From the start of monster labs. In all 3 cases, psm == 0. +// ZZogl-PG: GetRectMemAddress(0x3f4000, 0x404000, 0x0, 0x0, 0x0, 0x100, 0x40, 0x3f40, 0x100); +// ZZogl-PG: GetRectMemAddress(0x3f8000, 0x408000, 0x0, 0x0, 0x0, 0x100, 0x40, 0x3f80, 0x100); +// ZZogl-PG: GetRectMemAddress(0x3fc000, 0x40c000, 0x0, 0x0, 0x0, 0x100, 0x40, 0x3fc0, 0x100); + + void GetRectMemAddress(int& start, int& end, int psm, int x, int y, int w, int h, int bp, int bw) { FUNCLOG @@ -158,7 +164,7 @@ if (end > MEMORY_END) { - ZZLog::Warn_Log("Host local out of bounds!"); + ZZLog::Warn_Log("Init host local out of bounds! (end == 0x%x)", end); //gs.imageTransfer = -1; end = MEMORY_END; } @@ -178,9 +184,8 @@ int start, end; GetRectMemAddress(start, end, gs.dstbuf.psm, gs.imageX, gs.imageY, gs.imageWnew, gs.imageHnew, gs.dstbuf.bp, gs.dstbuf.bw); - + assert(start < gs_imageEnd); - end = gs_imageEnd; // sometimes games can decompress to alpha channel of render target only, in this case diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.cpp b/plugins/zzogl-pg/opengl/Linux/Linux.cpp index 95c2616997..5f046f5e4d 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Linux.cpp @@ -153,7 +153,7 @@ void CreateGameHackTable(GtkWidget *treeview, gameHacks hacks) add_map_entry(GAME_NOALPHATEST, "00080000", "Disable alpha testing - 00080000"); add_map_entry(GAME_DISABLEMRTDEPTH, "00100000", "Enable Multiple RTs - 00100000"); //GAME_32BITTARGS - //GAME_PATH3HACK (still implemented) + //GAME_PATH3HACK //GAME_DOPARALLELCTX add_map_entry(GAME_XENOSPECHACK, "01000000", "Specular Highlights - 01000000\nMakes graphics faster by removing highlights. (Automatically on for Xenosaga, Okami, & Okage.)"); //add_map_entry(GAME_PARTIALPOINTERS, "02000000", "Partial targets - 02000000"); diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h index a95c0ae753..a46caaa709 100644 --- a/plugins/zzogl-pg/opengl/Util.h +++ b/plugins/zzogl-pg/opengl/Util.h @@ -217,7 +217,7 @@ typedef struct gameHacks settings() { gameHacks tempHack; - tempHack._u32 = (hacks._u32 | def_hacks._u32 | GAME_PATH3HACK); + tempHack._u32 = (hacks._u32 | def_hacks._u32); return tempHack; } bool fullscreen() { return !!(zz_options.fullscreen); } diff --git a/plugins/zzogl-pg/opengl/ZZKeyboard.cpp b/plugins/zzogl-pg/opengl/ZZKeyboard.cpp index 3b9a0d7fcf..aca62bf3b4 100644 --- a/plugins/zzogl-pg/opengl/ZZKeyboard.cpp +++ b/plugins/zzogl-pg/opengl/ZZKeyboard.cpp @@ -116,7 +116,7 @@ typedef struct GameHackStruct u32 HackMask; } GameHack; -#define HACK_NUMBER 26 +#define HACK_NUMBER 25 GameHack HackinshTable[HACK_NUMBER] = { @@ -142,16 +142,16 @@ GameHack HackinshTable[HACK_NUMBER] = {"***17 No Alpha Test", GAME_NOALPHATEST}, {"***18 Disable MRT depth", GAME_DISABLEMRTDEPTH}, //{"***xx 32 bit targs", GAME_32BITTARGS}, - {"***19 Path 3 hack", GAME_PATH3HACK}, + //{"***xx Path 3 hack", GAME_PATH3HACK}, //{"***xx Parallel calls", GAME_DOPARALLELCTX}, - {"***20 Specular highlights", GAME_XENOSPECHACK}, + {"***19 Specular highlights", GAME_XENOSPECHACK}, //{"***xx Partial pointers", GAME_PARTIALPOINTERS}, - {"***21 Partial depth", GAME_PARTIALDEPTH}, - {"***22 Reget hack", GAME_REGETHACK}, + {"***20 Partial depth", GAME_PARTIALDEPTH}, + {"***21 Reget hack", GAME_REGETHACK}, - {"***23 Gust hack", GAME_GUSTHACK}, - {"***24 Log-Z", GAME_NOLOGZ}, - {"***25 Auto skipdraw", GAME_AUTOSKIPDRAW} + {"***22 Gust hack", GAME_GUSTHACK}, + {"***23 Log-Z", GAME_NOLOGZ}, + {"***24 Auto skipdraw", GAME_AUTOSKIPDRAW} }; int CurrentHackSetting = 0;