Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up unused parameters

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-07-24 15:31:42 +02:00
1 parent 906d877019
commit 8b05f703a4
6 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/jni/AndroidGraphicsContext.h
+1 -1
View File
@@ -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:
android/jni/AndroidJavaGLContext.cpp
+1 -1
View File
@@ -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.");
android/jni/AndroidJavaGLContext.h
+1 -1
View File
@@ -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;
android/jni/AndroidVulkanContext.cpp
+2 -2
View File
@@ -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;
android/jni/AndroidVulkanContext.h
+1 -1
View File
@@ -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;
android/jni/app-android.cpp
+3 -3
View File
@@ -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.