mirror of https://github.com/PCSX2/pcsx2.git
GregMiscellaneous: Fix a typo from the last commit. Add Skipdraw to the configuration file.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3662 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
a265546ddb
commit
e7b0d43544
|
@ -184,7 +184,7 @@ static const Game_Info crc_game_list[] =
|
|||
{
|
||||
// This section is straight from GSdx. Ones that also have ZZOgl hacks are commented out.
|
||||
|
||||
{0x00000000, Unknown_Title, Unknown_Region, 0},
|
||||
{0x00000000, Unknown_Title, Unknown_Region, 0, -1, -1},
|
||||
{0x2113EA2E, MetalSlug6, Unknown_Region, 0, -1, -1},
|
||||
{0x42E05BAF, TomoyoAfter, JP, 0, -1, -1},
|
||||
{0x7800DC84, Clannad, JP, 0, -1, -1},
|
||||
|
|
|
@ -178,7 +178,7 @@ void ListHacks()
|
|||
|
||||
void CALLBACK GSsetGameCRC(int crc, int options)
|
||||
{
|
||||
// build a list of function pointer for GetSkipCount (UserHacks_SkipDraw)
|
||||
// build a list of function pointer for GetSkipCount (SkipDraw)
|
||||
static GetSkipCount GSC_list[NUMBER_OF_TITLES];
|
||||
static bool inited = false;
|
||||
|
||||
|
@ -261,7 +261,7 @@ void CALLBACK GSsetGameCRC(int crc, int options)
|
|||
ZZLog::WriteLn("Setting TEXDESTROY_THRESH to %d", TEXDESTROY_THRESH);
|
||||
}
|
||||
|
||||
// FIXME need to check UserHacks_SkipDraw is positive (enabled by users)
|
||||
// FIXME need to check SkipDraw is positive (enabled by users)
|
||||
GetSkipCount_Handler = GSC_list[crc_game_list[i].title];
|
||||
|
||||
conf.def_hacks._u32 |= crc_game_list[i].flags;
|
||||
|
|
|
@ -49,6 +49,7 @@ void SaveConfig()
|
|||
fprintf(f, "x = %x\n", conf.x);
|
||||
fprintf(f, "y = %x\n", conf.y);
|
||||
fprintf(f, "log = %x\n", conf.log);
|
||||
fprintf(f, "skipdraw = %x\n", conf.SkipDraw);
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
|
@ -60,6 +61,7 @@ void LoadConfig()
|
|||
conf.mrtdepth = 1;
|
||||
conf.bilinear = 1;
|
||||
conf.log = 1;
|
||||
conf.SkipDraw = 0;
|
||||
|
||||
const std::string iniFile(s_strIniPath + "zzogl-pg.ini");
|
||||
FILE* f = fopen(iniFile.c_str(), "r");
|
||||
|
@ -83,6 +85,7 @@ void LoadConfig()
|
|||
err = fscanf(f, "x = %x\n", &conf.x);
|
||||
err = fscanf(f, "y = %x\n", &conf.y);
|
||||
err = fscanf(f, "log = %x\n", &conf.log);
|
||||
err = fscanf(f, "skipdraw = %x\n", &conf.SkipDraw);
|
||||
fclose(f);
|
||||
|
||||
// turn off all hacks by default
|
||||
|
|
|
@ -209,6 +209,7 @@ typedef struct
|
|||
int width, height; // View target size, has no impact towards speed
|
||||
int x, y; // Lets try for a persistant window position.
|
||||
bool isWideScreen; // Widescreen support
|
||||
u32 SkipDraw;
|
||||
u32 log;
|
||||
|
||||
void incAA() { aa++; if (aa > 4) aa = 0; }
|
||||
|
|
|
@ -25,6 +25,8 @@ void SaveConfig()
|
|||
WritePrivateProfileString("Settings", "Width", szValue, iniFile.c_str());
|
||||
sprintf(szValue, "%u", conf.height);
|
||||
WritePrivateProfileString("Settings", "Height", szValue, iniFile.c_str());
|
||||
sprintf(szValue, "%u", conf.SkipDraw);
|
||||
WritePrivateProfileString("Settings", "SkipDraw", szValue, iniFile.c_str());
|
||||
}
|
||||
|
||||
void LoadConfig()
|
||||
|
@ -40,6 +42,7 @@ void LoadConfig()
|
|||
conf.bilinear = 1;
|
||||
conf.width = 640;
|
||||
conf.height = 480;
|
||||
conf.SkipDraw = 0;
|
||||
|
||||
FILE *fp = fopen(iniFile.c_str(), "rt");
|
||||
|
||||
|
@ -67,6 +70,8 @@ void LoadConfig()
|
|||
conf.width = strtoul(szValue, NULL, 10);
|
||||
GetPrivateProfileString("Settings", "Height", NULL, szValue, 20, iniFile.c_str());
|
||||
conf.height = strtoul(szValue, NULL, 10);
|
||||
GetPrivateProfileString("Settings", "SkipDraw", NULL, szValue, 20, iniFile.c_str());
|
||||
conf.SkipDraw = strtoul(szValue, NULL, 10);
|
||||
|
||||
if (conf.aa < 0 || conf.aa > 4) conf.aa = 0;
|
||||
|
||||
|
|
|
@ -629,7 +629,7 @@ inline int Switch_Top_Bytes (int X) {
|
|||
|
||||
// Some storage formats could share the same memory block (2 textures in 1 format). This include following combinations:
|
||||
// PSMT24(24Z) with either 8H, 4HL, 4HH and PSMT4HL with PSMT4HH.
|
||||
// We use slightly different versions of this funtion on comparison with GSDX, Storage format XOR 48 made Z-textures
|
||||
// We use slightly different versions of this function on comparison with GSDX, Storage format XOR 48 made Z-textures
|
||||
// similar to normal ones and change higher bits on short (8 and 4 bits) textures.
|
||||
inline bool PSMT_HAS_SHARED_BITS (int fpsm, int tpsm) {
|
||||
int SUM = Switch_Top_Bytes(fpsm) + Switch_Top_Bytes(tpsm) ;
|
||||
|
@ -662,11 +662,7 @@ bool IsBadFrame(ZeroGS::VB& curvb)
|
|||
return 0;
|
||||
}
|
||||
|
||||
// FIXME Need to add a UserHacks_SkipDraw options, with a "number" value...
|
||||
int UserHacks_SkipDraw = 1; // test FFX
|
||||
UserHacks_SkipDraw = 0;
|
||||
|
||||
if(g_SkipFlushFrame == 0 && (UserHacks_SkipDraw > 0))
|
||||
if(g_SkipFlushFrame == 0 && (conf.SkipDraw > 0))
|
||||
{
|
||||
if(fi.TME)
|
||||
{
|
||||
|
@ -677,7 +673,7 @@ bool IsBadFrame(ZeroGS::VB& curvb)
|
|||
)
|
||||
{
|
||||
//ZZLog::Error_Log("Run the draw hack");
|
||||
g_SkipFlushFrame = UserHacks_SkipDraw;
|
||||
g_SkipFlushFrame = conf.SkipDraw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue