summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/RenderBase.cpp
diff options
context:
space:
mode:
authorFog <christhecoolist@gmail.com>2015-02-08 21:27:53 -0500
committerFog <christhecoolist@gmail.com>2015-06-10 20:17:30 -0400
commit6e7fedd4d0d2d0513e5ea9def31df4132a5350a2 (patch)
tree7de925d3690f14f79fc753b2aaa76082d3127ce6 /Source/Core/VideoCommon/RenderBase.cpp
parent5fe2924af62fb8386acbd5f364588470a173ba2e (diff)
Add UI Support for up to 8x Internal Resolutions
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
-rw-r--r--Source/Core/VideoCommon/RenderBase.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index dba0667b64..6071ce9511 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -211,8 +211,6 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int
efb_scale_denominatorX = efb_scale_denominatorY = 2;
break;
- case SCALE_3X:
- case SCALE_4X:
default:
efb_scale_numeratorX = efb_scale_numeratorY = s_last_efb_scale - 3;
efb_scale_denominatorX = efb_scale_denominatorY = 1;
@@ -328,7 +326,7 @@ void Renderer::DrawDebugText()
if ((u32)OSDTime > Common::Timer::GetTimeMs())
{
- const char* res_text = "";
+ std::string res_text;
switch (g_ActiveConfig.iEFBScale)
{
case SCALE_AUTO:
@@ -349,14 +347,10 @@ void Renderer::DrawDebugText()
case SCALE_2_5X:
res_text = "2.5x";
break;
- case SCALE_3X:
- res_text = "3x";
- break;
- case SCALE_4X:
- res_text = "4x";
+ default:
+ res_text = StringFromFormat("%dx", g_ActiveConfig.iEFBScale - 3);
break;
}
-
const char* ar_text = "";
switch (g_ActiveConfig.iAspectRatio)
{