Don't swapbuffer if stepping. Default to 2x zoom on Windows. Alert on missing atlases.

This commit is contained in:
Henrik Rydgard 2013-03-30 08:34:27 +01:00
parent e024f29240
commit 8833f6eb25
4 changed files with 12 additions and 3 deletions

View File

@ -69,7 +69,11 @@ void Config::Load(const char *iniFileName)
IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics"); IniFile::Section *graphics = iniFile.GetOrCreateSection("Graphics");
graphics->Get("ShowFPSCounter", &bShowFPSCounter, false); graphics->Get("ShowFPSCounter", &bShowFPSCounter, false);
graphics->Get("DisplayFramebuffer", &bDisplayFramebuffer, false); graphics->Get("DisplayFramebuffer", &bDisplayFramebuffer, false);
#ifdef _WIN32
graphics->Get("WindowZoom", &iWindowZoom, 2);
#else
graphics->Get("WindowZoom", &iWindowZoom, 1); graphics->Get("WindowZoom", &iWindowZoom, 1);
#endif
graphics->Get("BufferedRendering", &bBufferedRendering, true); graphics->Get("BufferedRendering", &bBufferedRendering, true);
graphics->Get("HardwareTransform", &bHardwareTransform, true); graphics->Get("HardwareTransform", &bHardwareTransform, true);
graphics->Get("LinearFiltering", &bLinearFiltering, false); graphics->Get("LinearFiltering", &bLinearFiltering, false);

View File

@ -119,9 +119,12 @@ void Core_RunLoop()
NativeRender(); NativeRender();
// Simple throttling to not burn the GPU in the menu. // Simple throttling to not burn the GPU in the menu.
#ifdef _WIN32 #ifdef _WIN32
if (globalUIState != UISTATE_INGAME) if (globalUIState != UISTATE_INGAME) {
Sleep(15); Sleep(15);
GL_SwapBuffers(); GL_SwapBuffers();
} else if (!Core_IsStepping()) {
GL_SwapBuffers();
}
#endif #endif
} }
} }

View File

@ -118,6 +118,7 @@ void __PPGeInit()
int height; int height;
int flags; int flags;
if (!LoadZIM("ppge_atlas.zim", &width, &height, &flags, &imageData)) { if (!LoadZIM("ppge_atlas.zim", &width, &height, &flags, &imageData)) {
PanicAlert("Failed to load ppge_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
ERROR_LOG(HLE, "PPGe init failed - no atlas texture. PPGe stuff will not be drawn."); ERROR_LOG(HLE, "PPGe init failed - no atlas texture. PPGe stuff will not be drawn.");
return; return;
} }

View File

@ -334,7 +334,8 @@ void NativeInitGraphics()
uiTexture = new Texture(); uiTexture = new Texture();
if (!uiTexture->Load("ui_atlas.zim")) if (!uiTexture->Load("ui_atlas.zim"))
{ {
ELOG("Failed to load texture"); PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
ELOG("Failed to load ui_atlas.zim");
} }
uiTexture->Bind(0); uiTexture->Bind(0);