mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-13 14:30:27 +02:00
Crashfixes on non-windows, update native to eat & signs (so we can share strings with windows menus)
This commit is contained in:
1 parent
4b6ae7a54e
commit
7ea3544082
2 files changed
+5
-3
No files matched your search
+4
-2
@@ -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();
|
||||
|
||||
+1
-1
Submodule native updated: b505648c99...ed48ad9c22.
Reference in new issue
Block a user