From 3d27799601dc9d560f02217b3cd201cb6fd79625 Mon Sep 17 00:00:00 2001
From: Jacky TSUI <raven02>
Date: Thu, 2 May 2013 20:34:35 +0800
Subject: [PATCH 1/2] Add xBRZ texture scaling to Android/iOS

---
 Core/Config.cpp    |  7 +++++--
 Core/Config.h      |  5 +++--
 UI/MenuScreens.cpp | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 266dad3d39..ec7d1142cc 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -99,7 +99,9 @@ void Config::Load(const char *iniFileName)
 	graphics->Get("LinearFiltering", &bLinearFiltering, false);
 	graphics->Get("SSAA", &SSAntiAliasing, 0);
 	graphics->Get("VBO", &bUseVBO, false);
-	graphics->Get("FrameSkip", &bFrameSkip, 0);
+	graphics->Get("FrameSkip", &bFrameSkip, false);
+	graphics->Get("XBRZTexScaling", &bXBRZTexScaling, false);
+	graphics->Get("XBRZTexScalingLevel", &iXBRZTexScalingLevel, 1);
 	graphics->Get("UseMediaEngine", &bUseMediaEngine, true);
 #ifdef USING_GLES2
 	graphics->Get("AnisotropicFiltering", &bAnisotropicFiltering, true);
@@ -115,7 +117,6 @@ void Config::Load(const char *iniFileName)
 #else
 	graphics->Get("MipMap", &bMipMap, false);
 #endif
-	graphics->Get("XBRZTexScalingLevel", &iXBRZTexScalingLevel, 1);
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
@@ -190,6 +191,8 @@ void Config::Save()
 		graphics->Set("SSAA", SSAntiAliasing);
 		graphics->Set("VBO", bUseVBO);
 		graphics->Set("FrameSkip", bFrameSkip);
+		graphics->Set("XBRZTexScaling", bXBRZTexScaling);
+		graphics->Set("XBRZTexScalingLevel", iXBRZTexScalingLevel);
 		graphics->Set("UseMediaEngine", bUseMediaEngine);	
 		graphics->Set("AnisotropicFiltering", bAnisotropicFiltering);
 		graphics->Set("VertexCache", bVertexCache);
diff --git a/Core/Config.h b/Core/Config.h
index bb134edb3a..eac31aef9d 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -60,7 +60,7 @@ public:
 	bool bLinearFiltering;
 	bool bUseVBO;
 	bool bStretchToDisplay;
-	bool bFrameSkip;  // 0 = off;  1 = auto;  (future:  2 = skip every 2nd frame;  3 = skip every 3rd frame etc).
+	bool bFrameSkip;  
 	int iNumSkip;
 	bool bUseMediaEngine;
 
@@ -74,7 +74,8 @@ public:
 	bool bTrueColor;
 	bool bMipMap;
 	bool bAnisotropicFiltering;
-	int iXBRZTexScalingLevel; // 1 = off, 2 = 2xBRZ, ..., 5 = 5xBRZ
+	bool bXBRZTexScaling;
+	int iXBRZTexScalingLevel; 
 
 	// Sound
 	bool bEnableSound;
diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 10f13eb1ed..99d36ca75f 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -734,6 +734,20 @@ void GraphicsScreenP2::render() {
 	} else
 		g_Config.iAnisotropyLevel = 0;
 
+	UICheckBox(GEN_ID, x, y += stride, gs->T("xBRZ Texture Scaling"), ALIGN_TOPLEFT, &g_Config.bXBRZTexScaling);
+	if (g_Config.bXBRZTexScaling) {
+		ui_draw2d.DrawText(UBUNTU24, gs->T("Level :"), x + 60, y += stride + 10, 0xFFFFFFFF, ALIGN_LEFT);
+		HLinear hlinear1(x + 160 , y + 5, 20);
+		if (UIButton(GEN_ID, hlinear1, 45, 0, "2x", ALIGN_LEFT))
+			g_Config.iXBRZTexScalingLevel = 2;
+		if (UIButton(GEN_ID, hlinear1, 45, 0, "3x", ALIGN_LEFT))
+			g_Config.iXBRZTexScalingLevel = 3;
+		if (UIButton(GEN_ID, hlinear1, 45, 0, "4x", ALIGN_LEFT))
+			g_Config.iXBRZTexScalingLevel = 4;
+		if (UIButton(GEN_ID, hlinear1, 60, 0, "5x", ALIGN_LEFT))
+			g_Config.iXBRZTexScalingLevel = 5;
+	} else
+		g_Config.iXBRZTexScalingLevel = 1;
 	UIEnd();
 }
 

From 773864566af65828a4c5226337d53ce9fdfb0821 Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Thu, 2 May 2013 21:01:20 +0800
Subject: [PATCH 2/2] Take out above 3x

---
 UI/MenuScreens.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 99d36ca75f..61a4330b71 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -742,10 +742,6 @@ void GraphicsScreenP2::render() {
 			g_Config.iXBRZTexScalingLevel = 2;
 		if (UIButton(GEN_ID, hlinear1, 45, 0, "3x", ALIGN_LEFT))
 			g_Config.iXBRZTexScalingLevel = 3;
-		if (UIButton(GEN_ID, hlinear1, 45, 0, "4x", ALIGN_LEFT))
-			g_Config.iXBRZTexScalingLevel = 4;
-		if (UIButton(GEN_ID, hlinear1, 60, 0, "5x", ALIGN_LEFT))
-			g_Config.iXBRZTexScalingLevel = 5;
 	} else
 		g_Config.iXBRZTexScalingLevel = 1;
 	UIEnd();