ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unused arguments removed from XFBSource::Draw 

Thanks neo.
This commit is contained in:
Matthew Parlane 2013-11-24 11:33:43 +13:00
parent 672fa65ee7
commit 0a31255943
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/Src/FramebufferManager.cpp
View File

@ -180,7 +180,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height
} }
void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc, 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, D3D::drawShadedTexSubQuad(tex->GetSRV(), &sourcerc,
texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false), texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false),

2
Source/Core/VideoBackends/D3D/Src/FramebufferManager.h
View File

@ -51,7 +51,7 @@ struct XFBSource : public XFBSourceBase
~XFBSource() { tex->Release(); } ~XFBSource() { tex->Release(); }
void Draw(const MathUtil::Rectangle<float> &sourcerc, 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 DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
void CopyEFB(float Gamma); void CopyEFB(float Gamma);

2
Source/Core/VideoBackends/D3D/Src/Render.cpp
View File

@ -832,7 +832,7 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r
//drawRc.right *= hScale; //drawRc.right *= hScale;
} }
xfbSource->Draw(sourceRc, drawRc, 0, 0); xfbSource->Draw(sourceRc, drawRc);
} }
} }
else else

2
Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
View File

@ -433,7 +433,7 @@ XFBSource::~XFBSource()
void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc, 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 // Texture map xfbSource->texture onto the main buffer
glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0); glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);

2
Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
View File

@ -52,7 +52,7 @@ struct XFBSource : public XFBSourceBase
void CopyEFB(float Gamma) override; void CopyEFB(float Gamma) override;
void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override; void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
void Draw(const MathUtil::Rectangle<float> &sourcerc, 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; const GLuint texture;
}; };

2
Source/Core/VideoBackends/OGL/Src/Render.cpp
View File

@ -1379,7 +1379,7 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r
sourceRc.top = xfbSource->sourceRc.top; sourceRc.top = xfbSource->sourceRc.top;
sourceRc.bottom = xfbSource->sourceRc.bottom; sourceRc.bottom = xfbSource->sourceRc.bottom;
xfbSource->Draw(sourceRc, drawRc, 0, 0); xfbSource->Draw(sourceRc, drawRc);
} }
} }
else else

3
Source/Core/VideoCommon/Src/FramebufferManagerBase.h
View File

@ -15,9 +15,8 @@ struct XFBSourceBase
{ {
virtual ~XFBSourceBase() {} virtual ~XFBSourceBase() {}
// TODO: only DX9 uses the width/height params
virtual void Draw(const MathUtil::Rectangle<float> &sourcerc, 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; virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0;