Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Reinit UI texture during game when used.

Browse source 
Otherwise we may try to use it when it doesn't exist.  This should only
happen on graphics restart.

Potentially related to first crash in #11116.
This commit is contained in:
Unknown W. Brackets 2018-06-01 21:07:09 -07:00
parent 8d3dbee823
commit 18bfff5f75
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
UI/EmuScreen.cpp
View file

@ -1116,6 +1116,11 @@ void EmuScreen::preRender() {
using namespace Draw;
DrawContext *draw = screenManager()->getDrawContext();
draw->BeginFrame();
// Let's be consistent for the entire frame. We skip the UI texture if we don't need it.
hasVisibleUI_ = hasVisibleUI();
if (hasVisibleUI_) {
screenManager()->getUIContext()->BeginFrame();
}
// Here we do NOT bind the backbuffer or clear the screen, unless non-buffered.
// The emuscreen is different than the others - we really want to allow the game to render to framebuffers
// before we ever bind the backbuffer for rendering. On mobile GPUs, switching back and forth between render
@ -1216,9 +1221,7 @@ void EmuScreen::render() {
if (invalid_)
return;
const bool hasVisibleUI = !osm.IsEmpty() || saveStatePreview_->GetVisibility() != UI::V_GONE || g_Config.bShowTouchControls || loadingSpinner_->GetVisibility() == UI::V_VISIBLE;
const bool showDebugUI = g_Config.bShowDebugStats || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug || g_Config.bShowFrameProfiler;
if (hasVisibleUI || showDebugUI || g_Config.iShowFPSCounter != 0) {
if (hasVisibleUI_) {
renderUI();
}
@ -1240,6 +1243,20 @@ void EmuScreen::render() {
*/
}
bool EmuScreen::hasVisibleUI() {
// Regular but uncommon UI.
if (saveStatePreview_->GetVisibility() != UI::V_GONE || loadingSpinner_->GetVisibility() == UI::V_VISIBLE)
return true;
if (!osm.IsEmpty() || g_Config.bShowTouchControls || g_Config.iShowFPSCounter != 0)
return true;
// Debug UI.
if (g_Config.bShowDebugStats || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug || g_Config.bShowFrameProfiler)
return true;
return false;
}
void EmuScreen::renderUI() {
using namespace Draw;

2
UI/EmuScreen.h
View file

@ -56,6 +56,7 @@ private:
void bootGame(const std::string &filename);
bool bootAllowStorage(const std::string &filename);
void bootComplete();
bool hasVisibleUI();
void renderUI();
void processAxis(const AxisInput &axis, int direction);
@ -79,6 +80,7 @@ private:
bool invalid_;
bool quit_;
bool stopRender_ = false;
bool hasVisibleUI_ = true;
std::string errorMessage_;
// If set, pauses at the end of the frame.