Merge pull request #1579 from PCSX2/gsdx-generic-double-half-clear

Gsdx generic double half clear

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}

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,

plugins/GSdx/GSRendererHW.cpp

@@ -692,7 +692,18 @@ void GSRendererHW::Draw()
 	}
 
 	if (!m_userhacks_disable_gs_mem_clear) {
+		// Constant Direct Write without texture/test/blending (aka a GS mem clear)
+		if ((m_vt.m_primclass == GS_SPRITE_CLASS) && !PRIM->TME && !PRIM->ABE // Direct write
+				&& (m_context->FRAME.FBMSK == 0) // no color mask
+				&& !m_context->TEST.ATE // no alpha test
+				&& (!m_context->TEST.ZTE || m_context->TEST.ZTST == ZTST_ALWAYS) // no depth test
+				&& (m_vt.m_eq.rgba == 0xFFFF) // constant color write
+				&& r.x == 0 && r.y == 0) { // Likely full buffer write
+
 			OI_GsMemClear();
+
+			OI_DoubleHalfClear(rt_tex, ds_tex);
+		}
 	}
 
 	// skip alpha test if possible
@@ -861,28 +872,19 @@ GSRendererHW::Hacks::Hacks()
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::FFXII, CRC::EU, &GSRendererHW::OI_FFXII));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::FFX, CRC::RegionCount, &GSRendererHW::OI_FFX));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::MetalSlug6, CRC::RegionCount, &GSRendererHW::OI_MetalSlug6));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::GodOfWar2, CRC::RegionCount, &GSRendererHW::OI_GodOfWar2));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::RozenMaidenGebetGarden, CRC::RegionCount, &GSRendererHW::OI_RozenMaidenGebetGarden));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SpidermanWoS, CRC::RegionCount, &GSRendererHW::OI_SpidermanWoS));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::DigimonRumbleArena2, CRC::RegionCount, &GSRendererHW::OI_DigimonRumbleArena2));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::StarWarsForceUnleashed, CRC::RegionCount, &GSRendererHW::OI_StarWarsForceUnleashed));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::BlackHawkDown, CRC::RegionCount, &GSRendererHW::OI_BlackHawkDown));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::XmenOriginsWolverine, CRC::RegionCount, &GSRendererHW::OI_XmenOriginsWolverine));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::CallofDutyFinalFronts, CRC::RegionCount, &GSRendererHW::OI_CallofDutyFinalFronts));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SpyroNewBeginning, CRC::RegionCount, &GSRendererHW::OI_SpyroNewBeginning));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SpyroEternalNight, CRC::RegionCount, &GSRendererHW::OI_SpyroEternalNight));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::TalesOfLegendia, CRC::RegionCount, &GSRendererHW::OI_TalesOfLegendia));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SuperManReturns, CRC::RegionCount, &GSRendererHW::OI_SuperManReturns));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::ArTonelico2, CRC::RegionCount, &GSRendererHW::OI_ArTonelico2));
 	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::ItadakiStreet, CRC::RegionCount, &GSRendererHW::OI_ItadakiStreet));
-	// Enable it by default in the future (hack ought to be safe enough)
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SimpsonsGame, CRC::RegionCount, &GSRendererHW::OI_DoubleHalfClear));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::TyTasmanianTiger, CRC::RegionCount, &GSRendererHW::OI_DoubleHalfClear));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::TyTasmanianTiger2, CRC::RegionCount, &GSRendererHW::OI_DoubleHalfClear));
-	m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::FFVIIDoC, CRC::RegionCount, &GSRendererHW::OI_DoubleHalfClear));
 
-	if (!can_handle_depth)
+	if (!can_handle_depth) {
 		m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::SMTNocturne, CRC::RegionCount, &GSRendererHW::OI_SMTNocturne));
+		m_oi_list.push_back(HackEntry<OI_Ptr>(CRC::GodOfWar2, CRC::RegionCount, &GSRendererHW::OI_GodOfWar2));
+	}
 
 	m_oo_list.push_back(HackEntry<OO_Ptr>(CRC::DBZBT2, CRC::RegionCount, &GSRendererHW::OO_DBZBT2));
 	m_oo_list.push_back(HackEntry<OO_Ptr>(CRC::MajokkoALaMode2, CRC::RegionCount, &GSRendererHW::OO_MajokkoALaMode2));
@@ -905,34 +907,28 @@ void GSRendererHW::Hacks::SetGameCRC(const CRC::Game& game)
 
 		m_oi = &GSRendererHW::OI_PointListPalette;
 	}
-
-	bool hack = theApp.GetConfigB("UserHacks_ColorDepthClearOverlap") && theApp.GetConfigB("UserHacks");
-	if (hack && !m_oi) {
-		// FIXME: Enable this code in the future. I think it could replace
-		// most of the "old" OI hack. So far code was tested on GoW2 & SimpsonsGame with
-		// success
-		m_oi = &GSRendererHW::OI_DoubleHalfClear;
-	}
 }
 
-// Handle case where the frame buffer and the Z buffer overlap
+// Trick to do a fast clear on the GS
-bool GSRendererHW::OI_DoubleHalfClear(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t)
+// Set frame buffer pointer on the start of the buffer. Set depth buffer pointer on the half buffer
+// FB + depth write will fill the full buffer.
+void GSRendererHW::OI_DoubleHalfClear(GSTexture* rt, GSTexture* ds)
 {
-	// Trick to do a fast clear on the GS
+	// Note gs mem clear must be tested before calling this function
-	// Set frame buffer pointer on the start of the buffer. Set depth buffer pointer on the half buffer
+
-	// FB + depth write will fill the full buffer.
+	// Limit further to unmask Z write
-	if ((m_vt.m_primclass == GS_SPRITE_CLASS) && !PRIM->TME && !m_context->ZBUF.ZMSK && rt && ds) {
+	if (!m_context->ZBUF.ZMSK && rt && ds) {
 		const GSVertex* v = &m_vertex.buff[0];
 		const GSLocalMemory::psm_t& frame_psm = GSLocalMemory::m_psm[m_context->FRAME.PSM];
 		const GSLocalMemory::psm_t& depth_psm = GSLocalMemory::m_psm[m_context->ZBUF.PSM];
 
 		// Z and color must be constant and the same
 		if (m_vt.m_eq.rgba != 0xFFFF || !m_vt.m_eq.z || v[1].XYZ.Z != v[1].RGBAQ.u32[0])
-			return true;
+			return;
 
 		// Format doesn't have the same size. It smells fishy
 		if (frame_psm.trbpp != depth_psm.trbpp)
-			return true;
+			return;
 
 		// Size of the current draw
 		uint32 w_pages = roundf(m_vt.m_max.p.x / frame_psm.pgs.x);
@@ -963,24 +959,17 @@ bool GSRendererHW::OI_DoubleHalfClear(GSTexture* rt, GSTexture* ds, GSTextureCac
 			} else {
 				m_dev->ClearRenderTarget(rt, color);
 			}
-
-			// warning: draw call mustn't be skipped to keep correct invalidation. Don't return false
 		}
 	}
-
-	return true;
 }
 
 // Note: hack is safe, but it could impact the perf a little (normally games do only a couple of clear by frame)
 void GSRendererHW::OI_GsMemClear()
 {
-	// Rectangle draw without texture
+	// Note gs mem clear must be tested before calling this function
-	if ((m_vt.m_primclass == GS_SPRITE_CLASS) && (m_vertex.next == 2) && !PRIM->TME && !PRIM->ABE // Direct write
+
-			&& (m_context->FRAME.FBMSK == 0)
+	// Limit it further to a full screen 0 write
-			&& !m_context->TEST.ATE // no alpha test
+	if ((m_vertex.next == 2) &&  m_vt.m_min.c.eq(GSVector4i(0))) {
-			&& (!m_context->TEST.ZTE || m_context->TEST.ZTST == ZTST_ALWAYS) // no depth test
-			&& (m_vt.m_eq.rgba == 0xFFFF && m_vt.m_min.c.eq(GSVector4i(0))) // Constant 0 write
-			) {
 		GSOffset* off = m_context->offset.fb;
 		GSVector4i r = GSVector4i(m_vt.m_min.p.xyxy(m_vt.m_max.p)).rintersect(GSVector4i(m_context->scissor.in));
 		// Limit the hack to a single fullscreen clear. Some games might use severals column to clear a screen
@@ -1298,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();
@@ -1370,52 +1312,12 @@ 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();
 	uint32 FPSM = m_context->FRAME.PSM;
 
-	if(!PRIM->TME)
+	if(PRIM->TME)
-	{
-		if(FPSM == PSM_PSMCT24 && (FBP == 0x02800 || FBP == 0x02bc0))	//0x2800 pal, 0x2bc0 ntsc
-		{
-			//half height buffer clear
-			m_dev->ClearDepth(ds);
-
-			return false;
-		}
-	}
-	else if(PRIM->TME)
 	{
 		if((FBP == 0x0 || FBP == 0x01180) && FPSM == PSM_PSMCT32 && (m_vt.m_eq.z && m_vt.m_min.p.z == 0))
 		{
@@ -1431,17 +1333,7 @@ bool GSRendererHW::OI_SpyroEternalNight(GSTexture* rt, GSTexture* ds, GSTextureC
 	uint32 FBP = m_context->FRAME.Block();
 	uint32 FPSM = m_context->FRAME.PSM;
 
-	if(!PRIM->TME)
+	if(PRIM->TME)
-	{
-		if(FPSM == PSM_PSMCT24 && FBP == 0x2bc0)
-		{
-			//half height buffer clear
-			m_dev->ClearDepth(ds);
-
-			return false;
-		}
-	}
-	else if(PRIM->TME)
 	{
 		if((FBP == 0x0 || FBP == 0x01180) && FPSM == PSM_PSMCT32 && (m_vt.m_eq.z && m_vt.m_min.p.z == 0))
 		{

plugins/GSdx/GSRendererHW.h

@@ -50,20 +50,15 @@ private:
 	// Require special argument
 	bool OI_BlitFMV(GSTextureCache::Target* _rt, GSTextureCache::Source* t, const GSVector4i& r_draw);
 	void OI_GsMemClear(); // always on
+	void OI_DoubleHalfClear(GSTexture* rt, GSTexture* ds); // always on
 
-	bool OI_DoubleHalfClear(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	bool OI_DoubleHalfClear_Vertical(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	bool OI_FFXII(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	bool OI_FFX(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	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);

plugins/GSdx/GSdx.cpp

@@ -337,7 +337,6 @@ void GSdxApp::Init()
 	m_default_configuration["UserHacks_AlphaHack"]                        = "0";
 	m_default_configuration["UserHacks_AlphaStencil"]                     = "0";
 	m_default_configuration["UserHacks_AutoFlush"]                        = "0";
-	m_default_configuration["UserHacks_ColorDepthClearOverlap"]           = "0";
 	m_default_configuration["UserHacks_DisableDepthSupport"]              = "0";
 	m_default_configuration["UserHacks_DisableGsMemClear"]                = "0";
 	m_default_configuration["UserHacks_DisablePartialInvalidation"]       = "0";