From fedc72eff582af4d31984df010bab1e954075c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 23 Nov 2018 09:51:16 +0100 Subject: [PATCH] Revert "Android: Fix Vulkan immersive startup." This reverts commit 5a5483ca9360fdc773da67413b19f9129394b5a8. --- UI/NativeApp.cpp | 5 +---- android/src/org/ppsspp/ppsspp/NativeActivity.java | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index c31745337b..2dd8ca97f5 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -133,7 +133,6 @@ static UI::Theme ui_theme; ScreenManager *screenManager; std::string config_filename; -bool g_graphicsIniting; bool g_graphicsInited; // Really need to clean this mess of globals up... but instead I add more :P @@ -754,7 +753,6 @@ static void UIThemeInit() { void RenderOverlays(UIContext *dc, void *userdata); bool NativeInitGraphics(GraphicsContext *graphicsContext) { - g_graphicsIniting = true; ILOG("NativeInitGraphics"); _assert_msg_(G3D, graphicsContext, "No graphics context!"); @@ -831,7 +829,6 @@ bool NativeInitGraphics(GraphicsContext *graphicsContext) { gpu->DeviceRestore(); g_graphicsInited = true; - g_graphicsIniting = false; ILOG("NativeInitGraphics completed"); return true; } @@ -1253,7 +1250,7 @@ void NativeMessageReceived(const char *message, const char *value) { void NativeResized() { // NativeResized can come from any thread so we just set a flag, then process it later. - if (g_graphicsInited || g_graphicsIniting) { + if (g_graphicsInited) { resized = true; } else { ILOG("NativeResized ignored, not initialized"); diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index 319147e01d..da7278c71d 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -569,11 +569,6 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C // Note that desiredSize might be 0,0 here - but that's fine when calling setFixedSize! It means auto. Log.d(TAG, "Setting fixed size " + desiredSize.x + " x " + desiredSize.y); holder.setFixedSize(desiredSize.x, desiredSize.y); - - // This may change it - but, since we're visible now, we can actually set this. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - updateSystemUiVisibility(); - } } @Override