Support loading a user-selected driver during vulkan initialization

app/src/main/cpp/skyline/common/android_settings.h

@@ -36,6 +36,8 @@ namespace skyline {
             systemLanguage = ktSettings.GetInt<skyline::language::SystemLanguage>("systemLanguage");
             forceTripleBuffering = ktSettings.GetBool("forceTripleBuffering");
             disableFrameThrottling = ktSettings.GetBool("disableFrameThrottling");
+            gpuDriver = ktSettings.GetString("gpuDriver");
+            gpuDriverLibraryName = ktSettings.GetString("gpuDriverLibraryName");
         };
     };
 }

app/src/main/cpp/skyline/common/settings.h

@@ -67,6 +67,10 @@ namespace skyline {
         Setting<bool> forceTripleBuffering; //!< If the presentation engine should always triple buffer even if the swapchain supports double buffering
         Setting<bool> disableFrameThrottling; //!< Allow the guest to submit frames without any blocking calls
 
+        // GPU
+        Setting<std::string> gpuDriver; //!< The label of the GPU driver to use
+        Setting<std::string> gpuDriverLibraryName; //!< The name of the GPU driver library to use
+
         Settings() = default;
 
         virtual ~Settings() = default;

app/src/main/cpp/skyline/gpu.cpp

@@ -5,6 +5,7 @@
 #include <adrenotools/driver.h>
 #include <os.h>
 #include <jvm.h>
+#include <common/settings.h>
 #include "gpu.h"
 
 namespace skyline::gpu {
@@ -332,30 +333,29 @@ namespace skyline::gpu {
     }
 
     static PFN_vkGetInstanceProcAddr LoadVulkanDriver(const DeviceState &state) {
-        // Try turnip first, if not then fallback to regular with file redirect then plain dlopen
+        void *libvulkanHandle{};
-        auto libvulkanHandle{adrenotools_open_libvulkan(
+
-            RTLD_NOW,
+        // If the user has selected a custom driver, try to load it
-            ADRENOTOOLS_DRIVER_CUSTOM,
+        if (!(*state.settings->gpuDriver).empty()) {
-            nullptr, // We require Android 10 so don't need to supply
-            state.os->nativeLibraryPath.c_str(),
-            (state.os->privateAppFilesPath + "gpu/turnip/").c_str(),
-            "libvulkan_freedreno.so",
-            nullptr
-        )};
-        if (!libvulkanHandle) {
             libvulkanHandle = adrenotools_open_libvulkan(
                 RTLD_NOW,
-                ADRENOTOOLS_DRIVER_FILE_REDIRECT,
+                ADRENOTOOLS_DRIVER_FILE_REDIRECT | ADRENOTOOLS_DRIVER_CUSTOM,
                 nullptr, // We require Android 10 so don't need to supply
                 state.os->nativeLibraryPath.c_str(),
-                nullptr,
+                (state.os->privateAppFilesPath + "gpu_drivers/" + *state.settings->gpuDriver + "/").c_str(),
-                nullptr,
+                (*state.settings->gpuDriverLibraryName).c_str(),
                 (state.os->publicAppFilesPath + "gpu/vk_file_redirect/").c_str()
             );
-            if (!libvulkanHandle)
+
-                libvulkanHandle = dlopen("libvulkan.so", RTLD_NOW);
+            if (!libvulkanHandle) {
+                char *error = dlerror();
+                Logger::Warn("Failed to load custom Vulkan driver {}/{}: {}", *state.settings->gpuDriver, *state.settings->gpuDriverLibraryName, error ? error : "");
+            }
         }
 
+        if (!libvulkanHandle)
+            libvulkanHandle = dlopen("libvulkan.so", RTLD_NOW);
+
         return reinterpret_cast<PFN_vkGetInstanceProcAddr>(dlsym(libvulkanHandle, "vkGetInstanceProcAddr"));
     }
 

app/src/main/java/emu/skyline/EmulationActivity.kt

@@ -28,16 +28,16 @@ import emu.skyline.applet.swkbd.SoftwareKeyboardDialog
 import emu.skyline.databinding.EmuActivityBinding
 import emu.skyline.input.*
 import emu.skyline.loader.getRomFormat
-import emu.skyline.utils.PreferenceSettings
 import emu.skyline.utils.ByteBufferSerializable
+import emu.skyline.utils.GpuDriverHelper
 import emu.skyline.utils.NativeSettings
+import emu.skyline.utils.PreferenceSettings
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.util.concurrent.FutureTask
 import javax.inject.Inject
 import kotlin.math.abs
 
-
 @AndroidEntryPoint
 class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTouchListener, DisplayManager.DisplayListener {
     companion object {
@@ -248,8 +248,9 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
         val romType = getRomFormat(rom, contentResolver).ordinal
         val romFd = contentResolver.openFileDescriptor(rom, "r")!!
 
+        GpuDriverHelper.ensureFileRedirectDir(this)
         emulationThread = Thread {
-            executeApplication(rom.toString(), romType, romFd.detachFd(), NativeSettings(preferenceSettings), applicationContext.getPublicFilesDir().canonicalPath + "/", applicationContext.filesDir.canonicalPath + "/", applicationInfo.nativeLibraryDir + "/", assets)
+            executeApplication(rom.toString(), romType, romFd.detachFd(), NativeSettings(this, preferenceSettings), applicationContext.getPublicFilesDir().canonicalPath + "/", applicationContext.filesDir.canonicalPath + "/", applicationInfo.nativeLibraryDir + "/", assets)
             returnFromEmulation()
         }
 

app/src/main/java/emu/skyline/utils/NativeSettings.kt

@@ -5,15 +5,19 @@
 
 package emu.skyline.utils
 
+import android.content.Context
+
 /**
  * The settings that will be passed to libskyline when running and executable
  */
-class NativeSettings(pref: PreferenceSettings) {
+class NativeSettings(context : Context, pref : PreferenceSettings) {
     var isDocked : Boolean = pref.isDocked
     var usernameValue : String = pref.usernameValue
     var systemLanguage : Int = pref.systemLanguage
     var forceTripleBuffering : Boolean = pref.forceTripleBuffering
     var disableFrameThrottling : Boolean = pref.disableFrameThrottling
+    var gpuDriver : String = if (pref.gpuDriver == PreferenceSettings.SYSTEM_GPU_DRIVER) "" else pref.gpuDriver
+    var gpuDriverLibraryName : String = if (pref.gpuDriver == PreferenceSettings.SYSTEM_GPU_DRIVER) "" else GpuDriverHelper.getLibraryName(context, pref.gpuDriver)
 
     /**
      * Updates settings in libskyline during emulation