preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-27 12:18:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hrydgard/ppsspp

Browse Source 
Conflicts:
	Core/Config.cpp
	Core/Config.h
This commit is contained in:
Peter Thoman committed 2013-05-03 00:24:03 +02:00
2 parents c692aaa936 4665226064
commit d8df8a6796
8 files changed
+72 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Config.cpp
+5 -5
View File
@@ -99,12 +99,12 @@ 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, false);
graphics->Get("FrameSkip", &iFrameSkip, 0);
graphics->Get("UseMediaEngine", &bUseMediaEngine, true);
#ifdef USING_GLES2
graphics->Get("AnisotropicFiltering", &bAnisotropicFiltering, true);
graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 0);
#else
graphics->Get("AnisotropicFiltering", &bAnisotropicFiltering, false);
graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 8);
#endif
graphics->Get("VertexCache", &bVertexCache, true);
graphics->Get("FullScreen", &bFullScreen, false);
@@ -190,9 +190,9 @@ void Config::Save()
graphics->Set("LinearFiltering", bLinearFiltering);
graphics->Set("SSAA", SSAntiAliasing);
graphics->Set("VBO", bUseVBO);
graphics->Set("FrameSkip", bFrameSkip);
graphics->Set("FrameSkip", iFrameSkip);
graphics->Set("UseMediaEngine", bUseMediaEngine);
graphics->Set("AnisotropicFiltering", bAnisotropicFiltering);
graphics->Set("AnisotropyLevel", iAnisotropyLevel);
graphics->Set("VertexCache", bVertexCache);
graphics->Set("FullScreen", bFullScreen);
graphics->Set("StretchToDisplay", bStretchToDisplay);