diff options
| author | degasus <wickmarkus@web.de> | 2013-04-08 15:57:51 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-04-08 15:57:51 +0200 |
| commit | 702198f39b4eb71a068c20c9969bd86856fa85ae (patch) | |
| tree | bdee823a26505a752dc9c512cfb9bcfee0cbe90f /Source/Core/VideoCommon/Src/RenderBase.cpp | |
| parent | ca8554e7d1d7c77b3c2a9ed8a7fb12de7096c67b (diff) | |
| parent | 4c40e70b8af839f84d7d9b8306116cabf3965cdb (diff) | |
Merge branch 'master' into primitive_restart
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Diffstat (limited to 'Source/Core/VideoCommon/Src/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/RenderBase.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 90a09aec43..652a613b2a 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -144,7 +144,7 @@ int Renderer::EFBToScaledX(int x) { switch (g_ActiveConfig.iEFBScale) { - case 0: // fractional + case SCALE_AUTO: // fractional return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width); default: @@ -156,7 +156,7 @@ int Renderer::EFBToScaledY(int y) { switch (g_ActiveConfig.iEFBScale) { - case 0: // fractional + case SCALE_AUTO: // fractional return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height); default: @@ -166,7 +166,7 @@ int Renderer::EFBToScaledY(int y) void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) { - if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) + if (g_ActiveConfig.iEFBScale == SCALE_AUTO || g_ActiveConfig.iEFBScale == SCALE_AUTO_INTEGRAL) { scaledX = x; scaledY = y; @@ -283,28 +283,28 @@ void Renderer::DrawDebugText() const char* res_text = ""; switch (g_ActiveConfig.iEFBScale) { - case 0: + case SCALE_AUTO: res_text = "Auto (fractional)"; break; - case 1: + case SCALE_AUTO_INTEGRAL: res_text = "Auto (integral)"; break; - case 2: + case SCALE_1X: res_text = "Native"; break; - case 3: + case SCALE_1_5X: res_text = "1.5x"; break; - case 4: + case SCALE_2X: res_text = "2x"; break; - case 5: + case SCALE_2_5X: res_text = "2.5x"; break; - case 6: + case SCALE_3X: res_text = "3x"; break; - case 7: + case SCALE_4X: res_text = "4x"; break; } |