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

FramebufferManagerBase: Remove obsolete parameters.

This commit is contained in:
Jules Blok 2014-12-25 00:58:16 +01:00
parent 49137c7c2c
commit 46bb4fd364
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un
D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM, 1, layers), layers);
}
void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc)
void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height)
{
*width = m_target_width;
*height = m_target_height;

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

@ -81,7 +81,7 @@ public:
private:
XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) override;
void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) override;
void GetTargetSize(unsigned int *width, unsigned int *height) override;
void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;

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

@ -545,7 +545,7 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un
return new XFBSource(texture, layers);
}
void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc)
void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height)
{
*width = m_targetWidth;
*height = m_targetHeight;

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

@ -93,7 +93,7 @@ public:
private:
XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) override;
void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) override;
void GetTargetSize(unsigned int *width, unsigned int *height) override;
void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;

6
Source/Core/VideoCommon/FramebufferManagerBase.cpp
View File

@ -146,7 +146,7 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe
m_virtualXFBList.splice(m_virtualXFBList.begin(), m_virtualXFBList, vxfb);
unsigned int target_width, target_height;
g_framebuffer_manager->GetTargetSize(&target_width, &target_height, sourceRc);
g_framebuffer_manager->GetTargetSize(&target_width, &target_height);
// recreate if needed
if (vxfb->xfbSource && (vxfb->xfbSource->texWidth != target_width || vxfb->xfbSource->texHeight != target_height))
@ -233,7 +233,7 @@ void FramebufferManagerBase::ReplaceVirtualXFB()
}
}
int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width)
int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x)
{
if (g_ActiveConfig.RealXFBEnabled())
return x;
@ -241,7 +241,7 @@ int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffe
return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth();
}
int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height)
int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y)
{
if (g_ActiveConfig.RealXFBEnabled())
return y;

6
Source/Core/VideoCommon/FramebufferManagerBase.h
View File

@ -48,8 +48,8 @@ public:
static unsigned int LastXfbWidth() { return s_last_xfb_width; }
static unsigned int LastXfbHeight() { return s_last_xfb_height; }
static int ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width);
static int ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height);
static int ScaleToVirtualXfbWidth(int x);
static int ScaleToVirtualXfbHeight(int y);
static unsigned int GetEFBLayers() { return m_EFBLayers; }
@ -73,7 +73,7 @@ protected:
private:
virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) = 0;
// TODO: figure out why OGL is different for this guy
virtual void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) = 0;
virtual void GetTargetSize(unsigned int *width, unsigned int *height) = 0;
static VirtualXFBListType::iterator FindVirtualXFB(u32 xfbAddr, u32 width, u32 height);

8
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -136,7 +136,7 @@ int Renderer::EFBToScaledX(int x)
switch (g_ActiveConfig.iEFBScale)
{
case SCALE_AUTO: // fractional
return FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width);
return FramebufferManagerBase::ScaleToVirtualXfbWidth(x);
default:
return x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
@ -148,7 +148,7 @@ int Renderer::EFBToScaledY(int y)
switch (g_ActiveConfig.iEFBScale)
{
case SCALE_AUTO: // fractional
return FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height);
return FramebufferManagerBase::ScaleToVirtualXfbHeight(y);
default:
return y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
@ -180,8 +180,8 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int
{
case SCALE_AUTO:
case SCALE_AUTO_INTEGRAL:
newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH, framebuffer_width);
newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT, framebuffer_height);
newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH);
newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT);
if (s_LastEFBScale == SCALE_AUTO_INTEGRAL)
{