diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index f6b4dd700a..fb90717ec5 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -307,8 +307,6 @@ CRC::Game CRC::m_games[] = {0x37CD4279, LordOfTheRingsThirdAge, KO, 0}, {0xE169BAF8, RedDeadRevolver, US, 0}, {0xE2E67E23, RedDeadRevolver, EU, 0}, - {0xEDDD6573, SpidermanWoS, US, 0}, //Web of Shadows - {0xF14C1D82, SpidermanWoS, EU, 0}, {0xF56C7948, HeavyMetalThunder, JP, 0}, {0x2498951B, SilentHill3, US, 0}, {0x5088CCDB, SilentHill3, EU, 0}, @@ -369,17 +367,9 @@ CRC::Game CRC::m_games[] = {0xB3A9F9ED, Black, JP, 0}, {0x7838882F, VF4, JP, 0}, {0xEA131B57, VF4, US, 0}, - {0x4F755D39, TyTasmanianTiger, US, 0}, - {0xD59D3252, TyTasmanianTiger, EU, 0}, - {0x5A1BB2A1, TyTasmanianTiger2, US, 0}, {0x44A5FA15, FFVIIDoC, US, 0}, {0x33F7D21A, FFVIIDoC, EU, 0}, {0xAFAC88EF, FFVIIDoC, JP, 0}, - {0x568A5C78, DigimonRumbleArena2, US, 0}, - {0x785E22BB, DigimonRumbleArena2, EU, 0}, - {0x4C5CE4C3, DigimonRumbleArena2, EU, 0}, - {0x7F995E8D, DigimonRumbleArena2, JP, 0}, - {0x115A184D, DigimonRumbleArena2, KO, 0}, {0x879CDA5E, StarWarsForceUnleashed, US, 0}, {0x137C792E, StarWarsForceUnleashed, US, 0}, {0x503BF9E1, StarWarsBattlefront, NoRegion, 0}, // EU and US versions have the same CRC @@ -406,9 +396,6 @@ CRC::Game CRC::m_games[] = {0x4A0E5B3A, MidnightClub3, US, 0}, //dub {0xEBE1972D, MidnightClub3, EU, 0}, //dub {0x60A42FF5, MidnightClub3, US, 0}, //remix - {0x4B1A0FFA, XmenOriginsWolverine, US, 0}, - {0xBFF3DBCB, CallofDutyFinalFronts, US, 0}, - {0xB78A5F5A, CallofDutyFinalFronts, EU, 0}, {0xD03D4C77, SpyroNewBeginning, US, 0}, {0x0EE5646B, SpyroNewBeginning, EU, 0}, // {0x7ACF7E03, SpyroNewBeginning, NoRegion, 0}, // same CRC as {ICO, NoRegion} diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h index 5ee7ceba4b..4ea89bee73 100644 --- a/plugins/GSdx/GSCrc.h +++ b/plugins/GSdx/GSCrc.h @@ -103,7 +103,6 @@ public: LordOfTheRingsTwoTowers, LordOfTheRingsThirdAge, RedDeadRevolver, - SpidermanWoS, HeavyMetalThunder, SilentHill3, SilentHill2, @@ -118,10 +117,7 @@ public: SSX3, Black, VF4, - TyTasmanianTiger, - TyTasmanianTiger2, FFVIIDoC, - DigimonRumbleArena2, StarWarsForceUnleashed, StarWarsBattlefront, StarWarsBattlefront2, @@ -131,8 +127,6 @@ public: BurnoutRevenge, BurnoutDominator, MidnightClub3, - XmenOriginsWolverine, - CallofDutyFinalFronts, SpyroNewBeginning, SpyroEternalNight, TalesOfLegendia, diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/GSRendererHW.cpp index fd5e8cb41f..18a6a67ac3 100644 --- a/plugins/GSdx/GSRendererHW.cpp +++ b/plugins/GSdx/GSRendererHW.cpp @@ -872,14 +872,8 @@ GSRendererHW::Hacks::Hacks() m_oi_list.push_back(HackEntry(CRC::FFXII, CRC::EU, &GSRendererHW::OI_FFXII)); m_oi_list.push_back(HackEntry(CRC::FFX, CRC::RegionCount, &GSRendererHW::OI_FFX)); m_oi_list.push_back(HackEntry(CRC::MetalSlug6, CRC::RegionCount, &GSRendererHW::OI_MetalSlug6)); - m_oi_list.push_back(HackEntry(CRC::GodOfWar2, CRC::RegionCount, &GSRendererHW::OI_GodOfWar2)); m_oi_list.push_back(HackEntry(CRC::RozenMaidenGebetGarden, CRC::RegionCount, &GSRendererHW::OI_RozenMaidenGebetGarden)); - m_oi_list.push_back(HackEntry(CRC::SpidermanWoS, CRC::RegionCount, &GSRendererHW::OI_SpidermanWoS)); - m_oi_list.push_back(HackEntry(CRC::DigimonRumbleArena2, CRC::RegionCount, &GSRendererHW::OI_DigimonRumbleArena2)); m_oi_list.push_back(HackEntry(CRC::StarWarsForceUnleashed, CRC::RegionCount, &GSRendererHW::OI_StarWarsForceUnleashed)); - m_oi_list.push_back(HackEntry(CRC::BlackHawkDown, CRC::RegionCount, &GSRendererHW::OI_BlackHawkDown)); - m_oi_list.push_back(HackEntry(CRC::XmenOriginsWolverine, CRC::RegionCount, &GSRendererHW::OI_XmenOriginsWolverine)); - m_oi_list.push_back(HackEntry(CRC::CallofDutyFinalFronts, CRC::RegionCount, &GSRendererHW::OI_CallofDutyFinalFronts)); m_oi_list.push_back(HackEntry(CRC::SpyroNewBeginning, CRC::RegionCount, &GSRendererHW::OI_SpyroNewBeginning)); m_oi_list.push_back(HackEntry(CRC::SpyroEternalNight, CRC::RegionCount, &GSRendererHW::OI_SpyroEternalNight)); m_oi_list.push_back(HackEntry(CRC::TalesOfLegendia, CRC::RegionCount, &GSRendererHW::OI_TalesOfLegendia)); @@ -887,8 +881,10 @@ GSRendererHW::Hacks::Hacks() m_oi_list.push_back(HackEntry(CRC::ArTonelico2, CRC::RegionCount, &GSRendererHW::OI_ArTonelico2)); m_oi_list.push_back(HackEntry(CRC::ItadakiStreet, CRC::RegionCount, &GSRendererHW::OI_ItadakiStreet)); - if (!can_handle_depth) + if (!can_handle_depth) { m_oi_list.push_back(HackEntry(CRC::SMTNocturne, CRC::RegionCount, &GSRendererHW::OI_SMTNocturne)); + m_oi_list.push_back(HackEntry(CRC::GodOfWar2, CRC::RegionCount, &GSRendererHW::OI_GodOfWar2)); + } m_oo_list.push_back(HackEntry(CRC::DBZBT2, CRC::RegionCount, &GSRendererHW::OO_DBZBT2)); m_oo_list.push_back(HackEntry(CRC::MajokkoALaMode2, CRC::RegionCount, &GSRendererHW::OO_MajokkoALaMode2)); @@ -1291,53 +1287,6 @@ bool GSRendererHW::OI_RozenMaidenGebetGarden(GSTexture* rt, GSTexture* ds, GSTex return true; } -bool GSRendererHW::OI_SpidermanWoS(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - uint32 FBP = m_context->FRAME.Block(); - uint32 FPSM = m_context->FRAME.PSM; - - if((FBP == 0x025a0 || FBP == 0x02800) && FPSM == PSM_PSMCT32) //0x2800 pal, 0x25a0 ntsc - { - //only top half of the screen clears - m_dev->ClearDepth(ds); - } - - return true; -} - -bool GSRendererHW::OI_DigimonRumbleArena2(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - uint32 FBP = m_context->FRAME.Block(); - uint32 FPSM = m_context->FRAME.PSM; - - if(!PRIM->TME) - { - if((FBP == 0x02300 || FBP == 0x03fc0) && FPSM == PSM_PSMCT32) - { - //half height buffer clear - m_dev->ClearDepth(ds); - } - } - - return true; -} - -bool GSRendererHW::OI_BlackHawkDown(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - uint32 FBP = m_context->FRAME.Block(); - uint32 FPSM = m_context->FRAME.PSM; - - if(FBP == 0x02000 && FPSM == PSM_PSMZ24) - { - //half height buffer clear - m_dev->ClearDepth(ds); - - return false; - } - - return true; -} - bool GSRendererHW::OI_StarWarsForceUnleashed(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) { uint32 FBP = m_context->FRAME.Block(); @@ -1363,36 +1312,6 @@ bool GSRendererHW::OI_StarWarsForceUnleashed(GSTexture* rt, GSTexture* ds, GSTex return true; } -bool GSRendererHW::OI_XmenOriginsWolverine(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - uint32 FBP = m_context->FRAME.Block(); - uint32 FPSM = m_context->FRAME.PSM; - - if(FBP == 0x0 && FPSM == PSM_PSMCT16) - { - //half height buffer clear - m_dev->ClearDepth(ds); - } - - return true; -} - -bool GSRendererHW::OI_CallofDutyFinalFronts(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - uint32 FBP = m_context->FRAME.Block(); - uint32 FPSM = m_context->FRAME.PSM; - - if(FBP == 0x02300 && FPSM == PSM_PSMZ24) - { - //half height buffer clear - m_dev->ClearDepth(ds); - - return false; - } - - return true; -} - bool GSRendererHW::OI_SpyroNewBeginning(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) { uint32 FBP = m_context->FRAME.Block(); diff --git a/plugins/GSdx/GSRendererHW.h b/plugins/GSdx/GSRendererHW.h index 688d4feb32..8e4cf7c4ee 100644 --- a/plugins/GSdx/GSRendererHW.h +++ b/plugins/GSdx/GSRendererHW.h @@ -58,12 +58,7 @@ private: bool OI_MetalSlug6(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_GodOfWar2(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_RozenMaidenGebetGarden(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - bool OI_SpidermanWoS(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - bool OI_DigimonRumbleArena2(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - bool OI_BlackHawkDown(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_StarWarsForceUnleashed(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - bool OI_XmenOriginsWolverine(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - bool OI_CallofDutyFinalFronts(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_SpyroNewBeginning(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_SpyroEternalNight(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); bool OI_TalesOfLegendia(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);