VideoCommon: Drop D3D9 SSAA implementation

This isn't needed for both OGL+D3D11 as they support sample shading directly. So we could use the common MSAA util shaders instead of writing custom ones.
dolphin-emu · Oct 29, 2013 · b253d60 · b253d60
1 parent c8d7db9
commit b253d60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
@@ -67,7 +67,6 @@ unsigned int Renderer::efb_scale_numeratorX = 1;
 unsigned int Renderer::efb_scale_numeratorY = 1;
 unsigned int Renderer::efb_scale_denominatorX = 1;
 unsigned int Renderer::efb_scale_denominatorY = 1;
-unsigned int Renderer::ssaa_multiplier = 1;
 
 
 Renderer::Renderer()
@@ -90,7 +89,7 @@ Renderer::~Renderer()
 	// invalidate previous efb format
 	prev_efb_format = (unsigned int)-1;
 
-	efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = ssaa_multiplier = 1;
+	efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = 1;
 
 #if defined _WIN32 || defined HAVE_LIBAV
 	if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping)
@@ -130,10 +129,10 @@ int Renderer::EFBToScaledX(int x)
 	switch (g_ActiveConfig.iEFBScale)
 	{
 	case SCALE_AUTO: // fractional
-			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width);
+			return FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width);
 
 		default:
-			return x * (int)ssaa_multiplier * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
+			return x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
 	};
 }
 
@@ -142,10 +141,10 @@ int Renderer::EFBToScaledY(int y)
 	switch (g_ActiveConfig.iEFBScale)
 	{
 		case SCALE_AUTO: // fractional
-			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height);
+			return FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height);
 
 		default:
-			return y * (int)ssaa_multiplier * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
+			return y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
 	};
 }
 
@@ -164,7 +163,7 @@ void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY)
 }
 
 // return true if target size changed
-bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier)
+bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height)
 {
 	int newEFBWidth, newEFBHeight;
 
@@ -228,10 +227,6 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int
 			break;
 	}
 
-	newEFBWidth *= multiplier;
-	newEFBHeight *= multiplier;
-	ssaa_multiplier = multiplier;
-
 	if (newEFBWidth != s_target_width || newEFBHeight != s_target_height)
 	{
 		s_target_width  = newEFBWidth;

diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
@@ -118,7 +118,7 @@ class Renderer
 protected:
 
 	static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY);
-	static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1);
+	static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height);
 
 	static void CheckFifoRecording();
 	static void RecordVideoMemory();
@@ -159,7 +159,6 @@ class Renderer
 	static unsigned int efb_scale_numeratorY;
 	static unsigned int efb_scale_denominatorX;
 	static unsigned int efb_scale_denominatorY;
-	static unsigned int ssaa_multiplier;
 };
 
 extern Renderer *g_renderer;