Update native with GL-lost-management (UI comes back on Android after switching away)

This commit is contained in:
Henrik Rydgard committed 2014-09-06 13:50:50 +02:00
1 parent 78e9a25d59
commit 0264ff62f0
4 files changed
+5 -9

No files matched your search

+1 -5
View File
@@ -74,7 +74,6 @@ enum LOG_TYPE {
NUMBER_OF_LOGS, // Must be last
};
// FIXME: should this be removed?
enum LOG_LEVELS {
LNOTICE = NOTICE_LEVEL,
LERROR = ERROR_LEVEL,
@@ -84,12 +83,9 @@ enum LOG_LEVELS {
LVERBOSE = VERBOSE_LEVEL,
};
#define LOGTYPES_LEVELS LogTypes::LOG_LEVELS
#define LOGTYPES_TYPE LogTypes::LOG_TYPE
} // namespace
void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
const char *file, int line, const char *fmt, ...)
#ifdef __GNUC__
__attribute__((format(printf, 5, 6)))
+1 -1
View File
@@ -609,7 +609,7 @@ again:
void GameInfoCache::SetupTexture(GameInfo *info, std::string &textureData, Thin3DContext *thin3d, Thin3DTexture *&tex, double &loadTime) {
if (textureData.size()) {
if (!tex) {
tex = thin3d->CreateTextureFromFileData(textureData.data(), (int)textureData.size(), T3DFileType::PNG);
tex = thin3d->CreateTextureFromFileData((const uint8_t *)textureData.data(), (int)textureData.size(), T3DImageType::PNG);
if (tex) {
loadTime = time_now_d();
} else {
+2 -2
View File
@@ -533,10 +533,10 @@ void NativeInitGraphics() {
ui_draw2d_front.Init(thin3d);
#ifdef USING_QT_UI
uiTexture = thin3d->CreateTextureFromFile("ui_atlas_lowmem.zim", T3DFileType::ZIM);
uiTexture = thin3d->CreateTextureFromFile("ui_atlas_lowmem.zim", T3DImageType::ZIM);
if (!uiTexture) {
#else
uiTexture = thin3d->CreateTextureFromFile("ui_atlas.zim", T3DFileType::ZIM);
uiTexture = thin3d->CreateTextureFromFile("ui_atlas.zim", T3DImageType::ZIM);
if (!uiTexture) {
#endif
PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
+1 -1
Submodule native updated: ef3912f63f...e96761e400.