Unused arguments removed from XFBSource::Draw

Thanks neo.
dolphin-emu · Nov 23, 2013 · 0a31255 · 0a31255
1 parent 672fa65
commit 0a31255
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/Source/Core/VideoBackends/D3D/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/Src/FramebufferManager.cpp
@@ -180,7 +180,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height
 }
 
 void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
-	const MathUtil::Rectangle<float> &drawrc, int width, int height) const
+	const MathUtil::Rectangle<float> &drawrc) const
 {
 	D3D::drawShadedTexSubQuad(tex->GetSRV(), &sourcerc,
 		texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false),

diff --git a/Source/Core/VideoBackends/D3D/Src/FramebufferManager.h b/Source/Core/VideoBackends/D3D/Src/FramebufferManager.h
@@ -51,7 +51,7 @@ struct XFBSource : public XFBSourceBase
 	~XFBSource() { tex->Release(); }
 
 	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
+		const MathUtil::Rectangle<float> &drawrc) const;
 	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
 	void CopyEFB(float Gamma);
 

diff --git a/Source/Core/VideoBackends/D3D/Src/Render.cpp b/Source/Core/VideoBackends/D3D/Src/Render.cpp
@@ -832,7 +832,7 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r
 				//drawRc.right *= hScale;
 			}
 
-			xfbSource->Draw(sourceRc, drawRc, 0, 0);
+			xfbSource->Draw(sourceRc, drawRc);
 		}
 	}
 	else

diff --git a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
@@ -433,7 +433,7 @@ XFBSource::~XFBSource()
 
 
 void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const
+		const MathUtil::Rectangle<float> &drawrc) const
 {
 	// Texture map xfbSource->texture onto the main buffer
 	glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);

diff --git a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
@@ -52,7 +52,7 @@ struct XFBSource : public XFBSourceBase
 	void CopyEFB(float Gamma) override;
 	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
 	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const override;
+		const MathUtil::Rectangle<float> &drawrc) const override;
 
 	const GLuint texture;
 };

diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp
@@ -1379,7 +1379,7 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r
 			sourceRc.top = xfbSource->sourceRc.top;
 			sourceRc.bottom = xfbSource->sourceRc.bottom;
 
-			xfbSource->Draw(sourceRc, drawRc, 0, 0);
+			xfbSource->Draw(sourceRc, drawRc);
 		}
 	}
 	else

diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h
@@ -15,9 +15,8 @@ struct XFBSourceBase
 {
 	virtual ~XFBSourceBase() {}
 
-	// TODO: only DX9 uses the width/height params
 	virtual void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const = 0;
+		const MathUtil::Rectangle<float> &drawrc) const = 0;
 
 	virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0;