Faster turbo mode for android. Causes flashing in unbuffered but that's a minor issue.

This commit is contained in:
Henrik Rydgard 2013-04-14 12:45:58 +02:00
parent 4c9e8defe8
commit 037bda0cbe
2 changed files with 15 additions and 13 deletions

View File

@ -282,6 +282,21 @@ void DoFrameTiming(bool &throttle, bool &skipFrame) {
// we have nothing to do here.
bool doFrameSkip = g_Config.iFrameSkip == 1;
// On non windows, which is always vsync locked, we need to force frameskip when
// unthrottled.
#ifndef _WIN32
if (!throttle) {
doFrameSkip = true;
skipFrame = true;
if (numSkippedFrames >= 6) {
INFO_LOG(HLE, "UNSKIP!");
skipFrame = false;
}
INFO_LOG(HLE, "UNTHROTTLE!");
return;
}
#endif
if (!throttle && !doFrameSkip)
return;
@ -297,14 +312,6 @@ void DoFrameTiming(bool &throttle, bool &skipFrame) {
// INFO_LOG(HLE,"FRAMESKIP %i", numSkippedFrames);
}
// On non windows, which is always vsync locked, we need to force frameskip when
// unthrottled.
#ifndef _WIN32
if (!throttle) {
doFrameSkip = true;
skipFrame = true;
}
#endif
if (curFrameTime < nextFrameTime && throttle)
{

View File

@ -569,7 +569,6 @@ void FileListAdapter::drawItem(int item, int x, int y, int w, int h, bool select
ui_draw2d.DrawImage2GridH(selected ? I_BUTTON_SELECTED: I_BUTTON, x, y, x + w);
ui_draw2d.DrawTextShadow(UBUNTU24, (*items_)[item].name.c_str(), x + UI_SPACE + iconSpace, y + 25, 0xFFFFFFFF, ALIGN_LEFT | ALIGN_VCENTER);
#if 1
// This might create a texture so we must flush first.
UIFlush();
GameInfo *ginfo = 0;
@ -592,10 +591,6 @@ void FileListAdapter::drawItem(int item, int x, int y, int w, int h, bool select
if (icon != -1)
ui_draw2d.DrawImage(icon, x + UI_SPACE, y + 25, 1.0f, 0xFFFFFFFF, ALIGN_VCENTER | ALIGN_LEFT);
}
#else
if (icon != -1)
ui_draw2d.DrawImage(icon, x + UI_SPACE, y + 25, 1.0f, 0xFFFFFFFF, ALIGN_VCENTER | ALIGN_LEFT);
#endif
}
FileSelectScreen::FileSelectScreen(const FileSelectScreenOptions &options) : options_(options) {