Revert Rodolfo's recent zcomploc commits until they actually work correctly.

This reverts commit 402006a83a89bc0f790934096e915f0e8c23f808.
This reverts commit 48d8d71391fc2cc40d85732680eb6421164bf87c.
This reverts commit 450dcc9d2cd874f6ab40d4a339afc29f55751319.

5 files changed, 37 insertions, 56 deletions

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 5340b84f1a..76964f248c 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -109,7 +109,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
 	uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4
 	uid->values[0] |= dstAlphaMode << 8; // 2
 
-	bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable) || g_ActiveConfig.bEnablePerPixelDepth;
+	bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth;
 
 	uid->values[0] |= DepthTextureEnable << 10; // 1
 
@@ -121,7 +121,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
 
 	uid->values[0] |= alphaPreTest << 16; // 2
 
-	if (alphaPreTest == 1 || (alphaPreTest == 2 && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS) || dstAlphaMode == DSTALPHA_ZCOMPLOC)
+	if (alphaPreTest == 1 || (alphaPreTest && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS))
 	{
 		// Courtesy of PreAlphaTest, we're done already ;)
 		// NOTE: The comment header of generated shaders depends on the value of bpmem.genmode.numindstages.. shouldnt really bother about that though.
@@ -177,8 +177,6 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
 			ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1
 			ptr[0] |= bpmem.zmode.testenable << 14; // 1
 			ptr[0] |= bpmem.zmode.updateenable << 15; // 1
-			ptr[0] |= g_ActiveConfig.bEnableFastZcomploc << 16; // 1
-			
 		}
 	}
 
@@ -186,8 +184,8 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
 	{
 		if (bpmem.fog.c_proj_fsel.fsel != 0)
 		{
-			ptr[0] |= bpmem.fog.c_proj_fsel.proj << 17; // 1
-			ptr[0] |= bpmem.fogRange.Base.Enabled << 18; // 1
+			ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1
+			ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1
 		}
 	}
 
@@ -212,8 +210,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u
 	*ptr++ = bpmem.zmode.hex; // 4
 	*ptr++ = g_ActiveConfig.bEnablePerPixelDepth; // 5
 	*ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 6
-	*ptr++ = g_ActiveConfig.bEnableFastZcomploc ; // 7
-	*ptr++ = xfregs.numTexGen.hex; // 8
+	*ptr++ = xfregs.numTexGen.hex; // 7
 
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
@@ -225,28 +222,28 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u
 	}
 
 	for (unsigned int i = 0; i < 8; ++i)
-		*ptr++ = xfregs.texMtxInfo[i].hex; // 9-16
+		*ptr++ = xfregs.texMtxInfo[i].hex; // 8-15
 
 	for (unsigned int i = 0; i < 16; ++i)
-		*ptr++ = bpmem.tevind[i].hex; // 17-32
+		*ptr++ = bpmem.tevind[i].hex; // 16-31
 
-	*ptr++ = bpmem.tevindref.hex; // 33
+	*ptr++ = bpmem.tevindref.hex; // 32
 
 	for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times
 	{
-		*ptr++ = bpmem.combiners[i].colorC.hex; // 34+5*i
-		*ptr++ = bpmem.combiners[i].alphaC.hex; // 35+5*i
-		*ptr++ = bpmem.tevind[i].hex; // 36+5*i
-		*ptr++ = bpmem.tevksel[i/2].hex; // 37+5*i
-		*ptr++ = bpmem.tevorders[i/2].hex; // 38+5*i
+		*ptr++ = bpmem.combiners[i].colorC.hex; // 33+5*i
+		*ptr++ = bpmem.combiners[i].alphaC.hex; // 34+5*i
+		*ptr++ = bpmem.tevind[i].hex; // 35+5*i
+		*ptr++ = bpmem.tevksel[i/2].hex; // 36+5*i
+		*ptr++ = bpmem.tevorders[i/2].hex; // 37+5*i
 	}
 
-	ptr = &uid->values[114];
+	ptr = &uid->values[113];
 
-	*ptr++ = bpmem.alphaFunc.hex; // 114
+	*ptr++ = bpmem.alphaFunc.hex; // 113
 
-	*ptr++ = bpmem.fog.c_proj_fsel.hex; // 115
-	*ptr++ = bpmem.fogRange.Base.hex; // 116
+	*ptr++ = bpmem.fog.c_proj_fsel.hex; // 114
+	*ptr++ = bpmem.fogRange.Base.hex; // 115
 
 	_assert_((ptr - uid->values) == uid->GetNumValues());
 }
@@ -526,7 +523,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
 		}
 	}
-	DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable) || g_ActiveConfig.bEnablePerPixelDepth ;
+	DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ;
 	// Declare samplers
 
 	if(ApiType != API_D3D11)
@@ -622,9 +619,9 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 
 	char* pmainstart = p;
 	int Pretest = AlphaPreTest();
-	if(Pretest >= 0 || dstAlphaMode == DSTALPHA_ZCOMPLOC)
+	if(Pretest >= 0 && !DepthTextureEnable)
 	{
-		if (!Pretest || dstAlphaMode == DSTALPHA_ZCOMPLOC)
+		if (!Pretest)
 		{
 			// alpha test will always fail, so restart the shader and just make it an empty function		
 			WRITE(p, "ocol0 = 0;\n");
@@ -632,18 +629,15 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 				WRITE(p, "depth = 1.f;\n");
 			if(dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
 					WRITE(p, "ocol1 = 0;\n");
-			if(dstAlphaMode != DSTALPHA_ZCOMPLOC)
-			{
-				WRITE(p, "discard;\n");
-				if(ApiType != API_D3D11)
-					WRITE(p, "return;\n");
-			}
+			WRITE(p, "discard;\n");
+			if(ApiType != API_D3D11)
+				WRITE(p, "return;\n");
 		}
-		else if (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable)
+		else if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
 		{
 			WRITE(p, "  ocol0 = "I_ALPHA"[0].aaaa;\n");
 		}
-		if(!Pretest || (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable) || dstAlphaMode == DSTALPHA_ZCOMPLOC)
+		if(!Pretest || dstAlphaMode == DSTALPHA_ALPHA_PASS)
 		{
 			WRITE(p, "}\n");
 			return text;
@@ -750,7 +744,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	if (DepthTextureEnable)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
-		if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable)
+		if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable)
 		{
 			if (bpmem.ztex2.op == ZTEXTURE_ADD)
 				WRITE(p, "zCoord = dot("I_ZBIAS"[0].xyzw, textemp.xyzw) + "I_ZBIAS"[1].w + zCoord;\n");
@@ -1186,15 +1180,17 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode
 
 	// HAXX: zcomploc is a way to control whether depth test is done before
 	// or after texturing and alpha test. PC GPU does depth test before texturing ONLY if depth value is
-	// not updated during shader execution. but GC hardware acts different:
-	// if zcomlock is enabled, depth value is updated even if alpha test fails
+	// not updated during shader execution.
 	// We implement "depth test before texturing" by discarding the fragment
 	// when the alpha test fail. This is not a correct implementation because
-	// even if the depth test fails the fragment could be alpha blended.	
-	// the more correct, but slow, way is:
-	// 1 - if zcomplock is enabled make a last pass, with color channel write disabled updating only 
-	// depth channel.	
-	if (!(g_ActiveConfig.bEnableFastZcomploc && bpmem.zcontrol.zcomploc && bpmem.zmode.updateenable))
+	// even if the depth test fails the fragment could be alpha blended.
+	// this implemnetation is a trick to  keep speed.
+	// the correct, but slow, way to implement a correct zComploc is :
+	// 1 - if zcomplock is enebled make a first pass, with color channel write disabled updating only 
+	// depth channel.
+	// 2 - in the next pass disable depth chanel update, but proccess the color data normally
+	// this way is the only CORRECT way to emulate perfectly the zcomplock behaviour
+	if (!(bpmem.zcontrol.zcomploc && bpmem.zmode.updateenable))
 	{
 		WRITE(p, "discard;\n");
 		if (ApiType != API_D3D11)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 99b0c60d45..31242a916e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -109,7 +109,6 @@ typedef _PIXELSHADERUID<true> PIXELSHADERUIDSAFE;
 enum DSTALPHA_MODE
 {
 	DSTALPHA_NONE, // Render normally, without destination alpha
-	DSTALPHA_ZCOMPLOC,
 	DSTALPHA_ALPHA_PASS, // Render normally first, then render again for alpha
 	DSTALPHA_DUAL_SOURCE_BLEND // Use dual-source blending
 };
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
index 80d710efde..e8d4c55a20 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.h
+++ b/Source/Core/VideoCommon/Src/RenderBase.h
@@ -43,21 +43,12 @@ extern int OSDChoice, OSDTime;
 
 extern bool bLastFrameDumped;
 
-
-enum RenderStateMode
-	{
-		RSM_None,
-		RSM_Multipass,
-		RSM_Zcomploc,
-		RSM_UseDstAlpha
-	};
 // Renderer really isn't a very good name for this class - it's more like "Misc".
 // The long term goal is to get rid of this class and replace it with others that make
 // more sense.
 class Renderer
 {
 public:
-	
 	Renderer();
 	virtual ~Renderer();
 
@@ -72,8 +63,8 @@ public:
 	virtual void SetSamplerState(int stage,int texindex) = 0;
 	virtual void SetInterlacingMode() = 0;
 
-	virtual void ApplyState(RenderStateMode mode) = 0;
-	virtual void RestoreState(RenderStateMode mode) = 0;
+	virtual void ApplyState(bool bUseDstAlpha) = 0;
+	virtual void RestoreState() = 0;
 
 	// Ideal internal resolution - determined by display resolution (automatic scaling) and/or a multiple of the native EFB resolution
 	static int GetTargetWidth() { return s_target_width; }
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 5eb293251d..5bb6e4dd99 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -76,7 +76,6 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0);
 	iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0);
 	iniFile.Get("Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth, 0);
-	iniFile.Get("Settings", "EnableFastZcomploc", &bEnableFastZcomploc, 0);
 	
 	iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0);
 	iniFile.Get("Settings", "EFBScale", &iEFBScale, 2); // native
@@ -139,7 +138,6 @@ void VideoConfig::GameIniLoad(const char *ini_file)
 	iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle);
 	iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
 	iniFile.GetIfExists("Video_Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth);
-	iniFile.GetIfExists("Video_Settings", "EnableFastZcomploc", &bEnableFastZcomploc);
 	iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode);
 	iniFile.GetIfExists("Video_Settings", "EFBScale", &iEFBScale); // integral
 	iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass);
@@ -211,7 +209,6 @@ void VideoConfig::Save(const char *ini_file)
 	iniFile.Set("Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
 	iniFile.Set("Settings", "EnablePixelLighting", bEnablePixelLighting);
 	iniFile.Set("Settings", "EnablePerPixelDepth", bEnablePerPixelDepth);
-	iniFile.Set("Settings", "EnableFastZcomploc", bEnableFastZcomploc);
 	
 
 	iniFile.Set("Settings", "ShowEFBCopyRegions", bShowEFBCopyRegions);
@@ -281,7 +278,6 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini)
 	SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
 	SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
 	SET_IF_DIFFERS("Video_Settings", "EnablePerPixelDepth", bEnablePerPixelDepth);
-	SET_IF_DIFFERS("Video_Settings", "EnableFastZcomploc", bEnableFastZcomploc);
 	SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode);
 	SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral
 	SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index d6dc3cefe0..7c846676bb 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -137,7 +137,6 @@ struct VideoConfig
 	bool bUseBBox;
 	bool bEnablePixelLighting;
 	bool bEnablePerPixelDepth;
-	bool bEnableFastZcomploc;
 
 	int iLog; // CONF_ bits
 	int iSaveTargetId;