diff options
| author | JosJuice <josjuice@gmail.com> | 2023-06-25 19:00:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-25 19:00:01 +0200 |
| commit | ac53ab184c044ecce463b5c19a24e163e7747a7b (patch) | |
| tree | b2965f79b17fa5eda9a30cce98985298f055aa23 /Source/Android/app/src/main/java/org | |
| parent | 50c929928cb1b8b125ef425d165316dc1754fd16 (diff) | |
| parent | 38a5774a85c9585205ae74b865c877b85af9b645 (diff) | |
Merge pull request #11952 from K0bin/no-per-game-driver
Android: Remove GPU driver from per-game settings
Diffstat (limited to 'Source/Android/app/src/main/java/org')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt | 13 |
1 files 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, |