Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-16 04:09:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Crashfixes on non-windows, update native to eat & signs (so we can share strings with windows menus)

Browse Source
This commit is contained in:
Henrik Rydgard 2013-08-30 18:15:45 +02:00
parent 4b6ae7a54e
commit 7ea3544082
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/NativeApp.cpp
View File

@ -455,7 +455,8 @@ void NativeInitGraphics() {
uiContext = new UIContext();
uiContext->theme = &ui_theme;
uiContext->Init(UIShader_Get(), UIShader_GetPlain(), uiTexture, &ui_draw2d, &ui_draw2d_front);
uiContext->Text()->SetFont("Tahoma", 20, 0);
if (uiContext->Text())
uiContext->Text()->SetFont("Tahoma", 20, 0);
screenManager->setUIContext(uiContext);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@ -551,7 +552,8 @@ void NativeRender() {
glUniformMatrix4fv(UIShader_Get()->u_worldviewproj, 1, GL_FALSE, ortho.getReadPtr());
screenManager->render();
screenManager->getUIContext()->Text()->OncePerFrame();
if (screenManager->getUIContext()->Text())
screenManager->getUIContext()->Text()->OncePerFrame();
if (g_TakeScreenshot) {
TakeScreenshot();

2
native

@ -1 +1 @@
Subproject commit b505648c9920659868fff62aba64d68d06895a5b
Subproject commit ed48ad9c223794126939bfdd8a1b5a0023096a9c