From 38a5774a85c9585205ae74b865c877b85af9b645 Mon Sep 17 00:00:00 2001 From: Robin Kertels Date: Thu, 15 Jun 2023 00:57:58 +0200 Subject: [PATCH] Android: Remove GPU driver from per-game settings --- .../settings/ui/SettingsFragmentPresenter.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index 5ed4238caf..8e3761cb0a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -65,7 +65,12 @@ class SettingsFragmentPresenter( controllerNumber = menuTag.subType } else if (menuTag.isSerialPort1Menu) { serialPort1Type = extras.getInt(ARG_SERIALPORT1_TYPE) - } else if (menuTag == MenuTag.GRAPHICS) { + } else if ( + menuTag == MenuTag.GRAPHICS + && this.gameId.isNullOrEmpty() + && !NativeLibrary.IsRunning() + && GpuDriverHelper.supportsCustomDriverLoading() + ) { this.gpuDriver = GpuDriverHelper.getInstalledDriverMetadata() ?: GpuDriverHelper.getSystemDriverMetadata( context.applicationContext @@ -1265,7 +1270,11 @@ class SettingsFragmentPresenter( ) ) - if (GpuDriverHelper.supportsCustomDriverLoading() && this.gpuDriver != null) { + if ( + this.gpuDriver != null && this.gameId.isNullOrEmpty() + && !NativeLibrary.IsRunning() + && GpuDriverHelper.supportsCustomDriverLoading() + ) { sl.add( SubmenuSetting( context,