Merge pull request #11952 from K0bin/no-per-game-driver

Android: Remove GPU driver from per-game settings
dolphin-emu · Jun 25, 2023 · ac53ab1 · ac53ab1
2 parents 50c9299 + 38a5774
commit ac53ab1
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/...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,