libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-21 09:21:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only disable buffered rendering by default on Galaxy Y instead of all

Browse Source 
Armv6 devices.

Would have like to use gpu feature flags but GL isn't necessarily initialized
when we load the config. Will need to find a different solution.

Also a buildfix for headless non-windows.
This commit is contained in:
Henrik Rydgård 2013-10-25 11:45:41 +02:00
parent 00ee8847e8
commit f73aec2570
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -560,6 +560,8 @@ add_library(native STATIC
native/gfx_es2/fbo.h
native/gfx_es2/gl_state.cpp
native/gfx_es2/gl_state.h
native/gfx_es2/gpu_features.cpp
native/gfx_es2/gpu_features.h
native/gfx_es2/glsl_program.cpp
native/gfx_es2/glsl_program.h
native/gfx_es2/vertex_format.cpp

23
Core/Config.cpp
View File

@ -23,6 +23,7 @@
#include "Config.h"
#include "file/ini_file.h"
#include "i18n/i18n.h"
#include "gfx_es2/gpu_features.h"
#include "HLE/sceUtility.h"
#include "Common/CPUDetect.h"
@ -35,8 +36,7 @@ extern bool isJailed;
Config::Config() { }
Config::~Config() { }
void Config::Load(const char *iniFileName, const char *controllerIniFilename)
{
void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
iniFilename_ = FindConfigFile(iniFileName != NULL ? iniFileName : "ppsspp.ini");
controllerIniFilename_ = FindConfigFile(controllerIniFilename != NULL ? controllerIniFilename : "controls.ini");
@ -91,7 +91,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
IniFile::Section *recent = iniFile.GetOrCreateSection("Recent");
recent->Get("MaxRecent", &iMaxRecent, 30);
// Fix issue from switching from uint (hex in .ini) to int (dec)
if (iMaxRecent == 0)
iMaxRecent = 30;
@ -119,7 +119,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
#endif
cpu->Get("SeparateCPUThread", &bSeparateCPUThread, false);
cpu->Get("AtomicAudioLocks", &bAtomicAudioLocks, false);
#ifdef __SYMBIAN32__
cpu->Get("SeparateIOThread", &bSeparateIOThread, false);
#else
@ -130,14 +130,13 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics");
graphics->Get("ShowFPSCounter", &iShowFPSCounter, false);
graphics->Get("RenderingMode", &iRenderingMode,
// Many ARMv6 devices have serious problems with buffered rendering.
#if defined(ARM) && !defined(ARMV7)
0
#else
1
#endif
); // default is buffered rendering mode
int renderingModeDefault = 1; // Buffered
if (System_GetProperty(SYSPROP_NAME) == "samsung:GT-S5360") {
renderingModeDefault = 0; // Non-buffered
}
graphics->Get("RenderingMode", &iRenderingMode, renderingModeDefault);
graphics->Get("SoftwareRendering", &bSoftwareRendering, false);
graphics->Get("HardwareTransform", &bHardwareTransform, true);
graphics->Get("TextureFiltering", &iTexFiltering, 1);

3
headless/Headless.cpp
View File

@ -326,7 +326,10 @@ int main(int argc, const char* argv[])
g_Config.iInternalResolution = 1;
g_Config.bFrameSkipUnthrottle = false;
#ifdef _WIN32
InitSysDirectories();
#endif
#if defined(ANDROID)
#elif defined(BLACKBERRY) || defined(__SYMBIAN32__)
#elif !defined(_WIN32)

2
native

@ -1 +1 @@
Subproject commit 26946b52e774b0853c10074ed078abf4b11cab36
Subproject commit 4c676c390448de2236c05df7648e9fc175f18896