From 7d2fd0ea313f738a2da144f11753da0fa0acff67 Mon Sep 17 00:00:00 2001
From: Peter Thoman <peter@metaclassofnil.com>
Date: Fri, 3 May 2013 10:29:29 +0200
Subject: [PATCH] Removed Bilinear texture filtering option

---
 .gitignore                 |   1 +
 Core/Config.cpp            |   2 +-
 Core/Config.h              |   2 +-
 GPU/GLES/TextureScaler.cpp |   5 ++---
 GPU/GLES/TextureScaler.h   |   2 +-
 Windows/WndMainWindow.cpp  |   4 ----
 Windows/ppsspp.rc          | Bin 37756 -> 37596 bytes
 Windows/resource.h         | Bin 164734 -> 164264 bytes
 8 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed0bca5fed..cbbe22f3ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ Windows/ipch
 
 # For ppsspp.ini, etc.
 ppsspp.ini
+PPSSPPControls.dat
 
 # Qt Linguist files
 *.qm
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 4922af6eee..7f5ec88649 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -116,7 +116,7 @@ void Config::Load(const char *iniFileName)
 	graphics->Get("MipMap", &bMipMap, false);
 #endif
 	graphics->Get("TexScalingLevel", &iTexScalingLevel, 1);
-	graphics->Get("TexScalingType", &iTexScalingType, 1);
+	graphics->Get("TexScalingType", &iTexScalingType, 0);
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
diff --git a/Core/Config.h b/Core/Config.h
index 14cc3e6f3e..8058bf51e2 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -73,7 +73,7 @@ public:
 	bool bTrueColor;
 	bool bMipMap;
 	int iTexScalingLevel; // 1 = off, 2 = 2x, ..., 5 = 5x
-	int iTexScalingType; // 0 = Bilinear, 1 = xBRZ, 2 = Hybrid
+	int iTexScalingType; // 0 = xBRZ, 1 = Hybrid
 
 	// Sound
 	bool bEnableSound;
diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp
index d967bb2cb6..8aa2ba8efa 100644
--- a/GPU/GLES/TextureScaler.cpp
+++ b/GPU/GLES/TextureScaler.cpp
@@ -275,15 +275,14 @@ void TextureScaler::Scale(u32* &data, GLenum &dstFmt, int &width, int &height, i
 
 	// scale 
 	switch(g_Config.iTexScalingType) {
-	case BILINEAR:
-		ScaleBilinear(factor, inputBuf, outputBuf, width, height);
-		break;
 	case XBRZ:
 		ScaleXBRZ(factor, inputBuf, outputBuf, width, height);
 		break;
 	case HYBRID:
 		ScaleHybrid(factor, inputBuf, outputBuf, width, height);
 		break;
+	default:
+		ERROR_LOG(G3D, "Unknown scaling type: %d", g_Config.iTexScalingType);
 	}
 
 	// update values accordingly
diff --git a/GPU/GLES/TextureScaler.h b/GPU/GLES/TextureScaler.h
index a870662c95..11b69fa966 100644
--- a/GPU/GLES/TextureScaler.h
+++ b/GPU/GLES/TextureScaler.h
@@ -31,7 +31,7 @@ public:
 
 	void Scale(u32* &data, GLenum &dstfmt, int &width, int &height, int factor);
 
-	enum { BILINEAR = 0, XBRZ= 1, HYBRID = 2 };
+	enum { XBRZ= 0, HYBRID = 1 };
 
 private:
 	void ScaleXBRZ(int factor, u32* source, u32* dest, int width, int height);
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 3eea9e07a7..4f30998456 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -521,9 +521,6 @@ namespace MainWindow
 				setTexScalingLevel(5);
 				break;
 
-			case ID_TEXTURESCALING_BILINEAR:
-				setTexScalingType(TextureScaler::BILINEAR);
-				break;
 			case ID_TEXTURESCALING_XBRZ:
 				setTexScalingType(TextureScaler::XBRZ);
 				break;
@@ -849,7 +846,6 @@ namespace MainWindow
 		}
 
 		static const int texscalingtypeitems[] = {
-			ID_TEXTURESCALING_BILINEAR,
 			ID_TEXTURESCALING_XBRZ,
 			ID_TEXTURESCALING_HYBRID,
 		};
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 76a7d92f67bca5029618a73faceff3a741543d37..58592b51f52d0b80ee51bc0f297d1d5bdc1ea9b6 100644
GIT binary patch
delta 14
WcmeyfjOor&rVY2MHdj?MNdN#lng;Fw

delta 64
zcmV-G0Kfm-r2_n>0<hY84?+NG0Bith0B!(f0AT=fli_$Rlkj&W4MG4(089W$08Ri!
W06~+nUl)@Q2MCi;WE8X7dIA{CsuY0$

diff --git a/Windows/resource.h b/Windows/resource.h
index 41bec3dae571e1f1fb80894f1fe7a0f560b87c4e..d74c24156cf1742b55f606014f8ab1fd01e20552 100644
GIT binary patch
delta 55
zcmey@#<ilEtD%K)3zJgL^oAU!I1nK=Jt&vS1H$6VWAd1uP{bs${Y)N{8r$}OQYJk<
E05TR5e*gdg

delta 131
zcmZ3{%=NF0tD%K)3zJgL^mF-43XI0n4fC0#r{yp;K=>vwKF9R59Hxrt`-+%Urkmt5
zNleRO;+TE}Bm~xHgitr-3ZvNc4S7sb+k<kMG}yrMoK6g$3_c8=41SXp{e`Fd#WJyN
Kk1J;K;sXFLE-26d