From 670192e56862b01a95ad80d4f76280407505bccd Mon Sep 17 00:00:00 2001
From: gnick79 <gnick79@gmail.com>
Date: Sun, 19 Dec 2010 22:00:25 +0000
Subject: [PATCH] * revert Clear Screen's stuff from r6604       reason :
 failure! (are needed more testing)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6621 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/VideoCommon/Src/BPFunctions.cpp    | 6 +++---
 Source/Core/VideoCommon/Src/RenderBase.h       | 2 +-
 Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +-
 Source/Plugins/Plugin_VideoDX11/Src/Render.h   | 4 ++--
 Source/Plugins/Plugin_VideoDX9/Src/Render.cpp  | 2 +-
 Source/Plugins/Plugin_VideoDX9/Src/Render.h    | 4 ++--
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp  | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/Render.h    | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
index 331b7e702f..a79ca067bc 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp
@@ -96,7 +96,7 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
 	{
 		u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
 		u32 z = bpmem.clearZValue;
-		
+		/*
 		// texture formats logic transposition from "EFB Copy to Texture" to "Copy Clear Screen" concepts.
 		// this it's a deduction without assurance. Ref. (p.12(Nintendo Co., Ltd. US 2010/0073394 A1))
 		UPE_Copy EFB_copy = bpmem.triggerEFBCopy; 
@@ -106,8 +106,8 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
 			color |= (!EFB_copy.intensity_fmt && z > 0) ? 0xFF000000 : 0x0;
 		else if (EFB_copy.tp_realFormat() == 7)	// A8
 			color |= ((!EFB_copy.intensity_fmt && bpmem.zcontrol.pixel_format > 3) || z > 0) ? 0xFF000000 : 0x0;
-		
-		g_renderer->ClearScreen(rc, colorEnable, zEnable, color, z);
+		*/
+		g_renderer->ClearScreen(rc, colorEnable, alphaEnable, zEnable, color, z);
 	}
 }
 
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
index 83238931ce..0e8111cafb 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.h
+++ b/Source/Core/VideoCommon/Src/RenderBase.h
@@ -109,7 +109,7 @@ public:
 
 	virtual void RenderText(const char* pstr, int left, int top, u32 color) = 0;
 
-	virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z) = 0;
+	virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) = 0;
 	static void RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc);
 
 	virtual u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) = 0;
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
index b97cdd1842..c3ac135643 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
@@ -684,7 +684,7 @@ void Renderer::UpdateViewport()
 	D3D::context->RSSetViewports(1, &vp);
 }
 
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z)
+void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
 {
 	ResetAPIState();
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.h b/Source/Plugins/Plugin_VideoDX11/Src/Render.h
index 2bb6084650..4ba3e16588 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.h
@@ -35,8 +35,8 @@ public:
 
 	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
 
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z);
-
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
+	
 	void UpdateViewport();
 
 	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index f769f3315f..44648dc622 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -785,7 +785,7 @@ void Renderer::UpdateViewport()
 	D3D::dev->SetViewport(&vp);
 }
 
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z)
+void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
 {
 	// Reset rendering pipeline while keeping color masks and depth buffer settings
 	ResetAPIState();
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.h b/Source/Plugins/Plugin_VideoDX9/Src/Render.h
index 73e49b4f21..4d47e3dc69 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.h
@@ -35,8 +35,8 @@ public:
 
 	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
 
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z);
-
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
+	
 	void UpdateViewport();
 
 	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index f37224e423..c751936220 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -807,7 +807,7 @@ void Renderer::UpdateViewport()
 	glDepthRange(GLNear, GLFar);
 }
 
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z)
+void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
 {
 	// Update the view port for clearing the picture
 	TargetRectangle targetRc = ConvertEFBRectangle(rc);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
index d65e5bc67c..3747c38f28 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
@@ -37,7 +37,7 @@ public:
 
 	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
 
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z);
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
 
 	void UpdateViewport();