summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/RenderBase.cpp
diff options
context:
space:
mode:
authorlioncash <mathew1900@hotmail.com>2013-01-16 15:46:11 -0500
committerlioncash <mathew1900@hotmail.com>2013-01-16 15:46:11 -0500
commit0ef3bd9c778a786ec439950f65c863d64ccf98b6 (patch)
tree35c0cc6e03cf45eeff2496b582d3720ad75defbe /Source/Core/VideoCommon/Src/RenderBase.cpp
parent87431666639c7036ea0f5b0d499df639cefb3d51 (diff)
Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)."
Turns out I was wrong in my previous commit. My bad. This reverts commit 87431666639c7036ea0f5b0d499df639cefb3d51.
Diffstat (limited to 'Source/Core/VideoCommon/Src/RenderBase.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/RenderBase.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
index 1ea7afbc1e..8e1d012fa2 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.cpp
+++ b/Source/Core/VideoCommon/Src/RenderBase.cpp
@@ -60,12 +60,12 @@ std::string Renderer::s_sScreenshotName;
volatile bool Renderer::s_bScreenshot;
// The framebuffer size
-unsigned int Renderer::s_target_width;
-unsigned int Renderer::s_target_height;
+int Renderer::s_target_width;
+int Renderer::s_target_height;
// TODO: Add functionality to reinit all the render targets when the window is resized.
-unsigned int Renderer::s_backbuffer_width;
-unsigned int Renderer::s_backbuffer_height;
+int Renderer::s_backbuffer_width;
+int Renderer::s_backbuffer_height;
TargetRectangle Renderer::target_rc;
@@ -163,7 +163,7 @@ int Renderer::EFBToScaledY(int y)
};
}
-void Renderer::CalculateTargetScale(unsigned int x, unsigned int y, unsigned int &scaledX, unsigned int &scaledY)
+void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY)
{
if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1)
{
@@ -172,15 +172,15 @@ void Renderer::CalculateTargetScale(unsigned int x, unsigned int y, unsigned int
}
else
{
- scaledX = x * (efb_scale_numeratorX / efb_scale_denominatorX);
- scaledY = y * (efb_scale_numeratorY / efb_scale_denominatorY);
+ scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
+ scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
}
}
// return true if target size changed
-bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, unsigned int multiplier)
+bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier)
{
- u32 newEFBWidth, newEFBHeight;
+ int newEFBWidth, newEFBHeight;
// TODO: Ugly. Clean up
switch (s_LastEFBScale)
@@ -374,7 +374,7 @@ void Renderer::DrawDebugText()
// TODO: remove
extern bool g_aspect_wide;
-void Renderer::UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height)
+void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height)
{
float FloatGLWidth = (float)backbuffer_width;
float FloatGLHeight = (float)backbuffer_height;
@@ -492,7 +492,7 @@ void Renderer::UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height)
target_rc.bottom = YOffset + iHeight;
}
-void Renderer::SetWindowSize(u32 width, u32 height)
+void Renderer::SetWindowSize(int width, int height)
{
if (width < 1)
width = 1;