summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-12-25 00:58:16 +0100
committerJules Blok <jules.blok@gmail.com>2014-12-25 00:58:16 +0100
commit46bb4fd364ccd5e13c2cb13f1d8356526948337e (patch)
tree400eb2d2c9afeecd673d5914954e81572e716a69 /Source
parent49137c7c2cd679a7e70330dac2364d448dac8c38 (diff)
FramebufferManagerBase: Remove obsolete parameters.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/VideoBackends/D3D/FramebufferManager.cpp2
-rw-r--r--Source/Core/VideoBackends/D3D/FramebufferManager.h2
-rw-r--r--Source/Core/VideoBackends/OGL/FramebufferManager.cpp2
-rw-r--r--Source/Core/VideoBackends/OGL/FramebufferManager.h2
-rw-r--r--Source/Core/VideoCommon/FramebufferManagerBase.cpp6
-rw-r--r--Source/Core/VideoCommon/FramebufferManagerBase.h6
-rw-r--r--Source/Core/VideoCommon/RenderBase.cpp8
7 files changed, 14 insertions, 14 deletions
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
index 705abdbde3..9027bc21d5 100644
--- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
@@ -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;
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.h b/Source/Core/VideoBackends/D3D/FramebufferManager.h
index f45b312314..559215e7e8 100644
--- a/Source/Core/VideoBackends/D3D/FramebufferManager.h
+++ b/Source/Core/VideoBackends/D3D/FramebufferManager.h
@@ -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;
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
index 2bf01e8085..9a238fc23f 100644
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
@@ -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;
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h
index f428340834..9b26e32335 100644
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.h
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h
@@ -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;
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
index 83ad3a1ca4..178a157f9a 100644
--- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp
+++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
@@ -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;
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h
index b8f1da0810..5b97f1835d 100644
--- a/Source/Core/VideoCommon/FramebufferManagerBase.h
+++ b/Source/Core/VideoCommon/FramebufferManagerBase.h
@@ -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);
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index 8db728842f..50778172cf 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -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)
{