diff --git a/android/jni/AndroidGraphicsContext.h b/android/jni/AndroidGraphicsContext.h index 544b5c2c06..0c6f963086 100644 --- a/android/jni/AndroidGraphicsContext.h +++ b/android/jni/AndroidGraphicsContext.h @@ -20,7 +20,7 @@ class AndroidGraphicsContext : public GraphicsContext { public: // This is different than the base class function since on // Android (EGL, Vulkan) we do have all this info on the render thread. - virtual bool InitFromRenderThread(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) = 0; + virtual bool InitFromRenderThread(ANativeWindow *wnd) = 0; virtual void BeginAndroidShutdown() {} private: diff --git a/android/jni/AndroidJavaGLContext.cpp b/android/jni/AndroidJavaGLContext.cpp index 4fc9473b8c..69298c7cf0 100644 --- a/android/jni/AndroidJavaGLContext.cpp +++ b/android/jni/AndroidJavaGLContext.cpp @@ -10,7 +10,7 @@ AndroidJavaEGLGraphicsContext::AndroidJavaEGLGraphicsContext() { SetGPUBackend(GPUBackend::OPENGL); } -bool AndroidJavaEGLGraphicsContext::InitFromRenderThread(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) { +bool AndroidJavaEGLGraphicsContext::InitFromRenderThread(ANativeWindow *wnd) { INFO_LOG(Log::G3D, "AndroidJavaEGLGraphicsContext::InitFromRenderThread"); if (!CheckGLExtensions()) { ERROR_LOG(Log::G3D, "CheckGLExtensions failed - not gonna attempt starting up."); diff --git a/android/jni/AndroidJavaGLContext.h b/android/jni/AndroidJavaGLContext.h index 6ae1374448..ad0e67eff2 100644 --- a/android/jni/AndroidJavaGLContext.h +++ b/android/jni/AndroidJavaGLContext.h @@ -12,7 +12,7 @@ public: bool NeedsRenderThread() const override { return true; } // This performs the actual initialization, - bool InitFromRenderThread(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) override; + bool InitFromRenderThread(ANativeWindow *wnd) override; void ShutdownFromRenderThread() override; diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp index 0b7df65fe1..9036cc1a44 100644 --- a/android/jni/AndroidVulkanContext.cpp +++ b/android/jni/AndroidVulkanContext.cpp @@ -55,8 +55,8 @@ bool AndroidVulkanContext::InitAPI() { return true; } -bool AndroidVulkanContext::InitFromRenderThread(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) { - INFO_LOG(Log::G3D, "AndroidVulkanContext::InitFromRenderThread: desiredwidth=%d desiredheight=%d", desiredBackbufferSizeX, desiredBackbufferSizeY); +bool AndroidVulkanContext::InitFromRenderThread(ANativeWindow *wnd) { + INFO_LOG(Log::G3D, "AndroidVulkanContext::InitFromRenderThread"); if (!g_Vulkan) { ERROR_LOG(Log::G3D, "AndroidVulkanContext::InitFromRenderThread: No Vulkan context"); return false; diff --git a/android/jni/AndroidVulkanContext.h b/android/jni/AndroidVulkanContext.h index 7da96fbd92..bcdf070fe2 100644 --- a/android/jni/AndroidVulkanContext.h +++ b/android/jni/AndroidVulkanContext.h @@ -11,7 +11,7 @@ public: bool InitAPI(); - bool InitFromRenderThread(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) override; + bool InitFromRenderThread(ANativeWindow *wnd) override; void ShutdownFromRenderThread() override; // Inverses InitFromRenderThread. void Shutdown() override; diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 58159ba082..8572866bc2 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -1034,7 +1034,7 @@ extern "C" jboolean Java_org_ppsspp_ppsspp_NativeRenderer_displayInit(JNIEnv * e std::string errorMessage; if (!renderer_inited) { INFO_LOG(Log::G3D, "NativeApp.displayInit() first time"); - if (!graphicsContext->InitFromRenderThread(nullptr, 0, 0, 0, 0)) { + if (!graphicsContext->InitFromRenderThread((ANativeWindow *)nullptr)) { System_Toast("Graphics initialization failed. Quitting."); return false; } @@ -1068,7 +1068,7 @@ extern "C" jboolean Java_org_ppsspp_ppsspp_NativeRenderer_displayInit(JNIEnv * e INFO_LOG(Log::G3D, "Shut down both threads. Now let's bring it up again!"); - if (!graphicsContext->InitFromRenderThread(nullptr, 0, 0, 0, 0)) { + if (!graphicsContext->InitFromRenderThread((ANativeWindow *)nullptr)) { System_Toast("Graphics initialization failed. Quitting."); return false; } @@ -1769,7 +1769,7 @@ static void VulkanEmuThread(ANativeWindow *wnd) { WARN_LOG(Log::G3D, "runVulkanRenderLoop. display_xres=%d display_yres=%d desiredBackbufferSizeX=%d desiredBackbufferSizeY=%d", display_xres, display_yres, desiredBackbufferSizeX, desiredBackbufferSizeY); - if (!graphicsContext->InitFromRenderThread(wnd, desiredBackbufferSizeX, desiredBackbufferSizeY, backbuffer_format, androidVersion)) { + if (!graphicsContext->InitFromRenderThread(wnd)) { // On Android, if we get here, really no point in continuing. // The UI is supposed to render on any device both on OpenGL and Vulkan. If either of those don't work // on a device, we blacklist it. Hopefully we should have already failed in InitAPI anyway and reverted to GL back then.