Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-21 06:33:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1629 from raven02/xbrz

Browse Source 
Add xBRZ texture scaling to Android/iOS
This commit is contained in:
Henrik Rydgård 2013-05-02 06:13:27 -07:00
commit 45b6670310
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Config.cpp
View File

@ -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);

5
Core/Config.h
View File

@ -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;

10
UI/MenuScreens.cpp
View File

@ -734,6 +734,16 @@ 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;
} else
g_Config.iXBRZTexScalingLevel = 1;
UIEnd();
}