From 23bebc5270bfd5a149aeb8bb5a3a2dd4433bd5e1 Mon Sep 17 00:00:00 2001 From: Robin Kertels Date: Thu, 1 Jun 2023 00:05:06 +0200 Subject: VideoBackends:Vulkan: Allow loading custom drivers on Android ... using libadrenotools --- Source/Android/app/build.gradle | 7 +- Source/Android/app/src/main/AndroidManifest.xml | 10 +- .../features/settings/model/StringSetting.kt | 6 + .../dolphinemu/utils/DirectoryInitialization.java | 60 ++++++--- Source/Android/app/src/main/res/values/strings.xml | 12 ++ Source/Android/jni/CMakeLists.txt | 7 + Source/Android/jni/GpuDriver.cpp | 147 +++++++++++++++++++++ Source/Android/jni/MainAndroid.cpp | 9 ++ 8 files changed, 236 insertions(+), 22 deletions(-) create mode 100644 Source/Android/jni/GpuDriver.cpp (limited to 'Source/Android') diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 36ed3baf02..3ad867b2a6 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.serialization' version "1.7.20" } task copyProfile (type: Copy) { @@ -110,6 +111,7 @@ android { externalNativeBuild { cmake { path "../../../CMakeLists.txt" + version "3.22.1+" } } namespace 'org.dolphinemu.dolphinemu' @@ -122,7 +124,7 @@ android { abiFilters "arm64-v8a", "x86_64" //, "armeabi-v7a", "x86" // Remove the line below if you want to build the C++ unit tests - targets "main" + //targets "main", "hook_impl", "main_hook", "gsl_alloc_hook", "file_redirect_hook" } } } @@ -160,6 +162,9 @@ dependencies { // For loading game covers from disk and GameTDB implementation 'io.coil-kt:coil:2.2.2' + // For loading custom GPU drivers + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3" + implementation 'com.nononsenseapps:filepicker:4.2.1' } diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index f470bafee7..db35188e6e 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -41,7 +41,8 @@ android:supportsRtl="true" android:isGame="true" android:banner="@drawable/banner_tv" - android:hasFragileUserData="true"> + android:hasFragileUserData="true" + android:extractNativeLibs="true"> @@ -82,6 +83,13 @@ android:theme="@style/Theme.Dolphin.Main" android:label="@string/settings"/> + + GitHub Support \u00A9 2003–2015+ Dolphin Team. \u201cGameCube\u201d and \u201cWii\u201d are trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way. + System driver + The GPU driver that is part of the OS. + + + GPU driver + Installing the GPU driver… + GPU driver installed successfully + Failed to unzip the provided driver package + The supplied driver package is invalid due to missing metadata + The supplied driver package contains invalid metadata, it may be corrupted + Your device doesn\'t meet the minimum Android version requirements for the supplied driver + The supplied driver package is already installled Emulated USB Devices diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index bc48ec26db..7218c64924 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -30,6 +30,7 @@ add_library(main SHARED RiivolutionPatches.cpp SkylanderConfig.cpp WiiUtils.cpp + GpuDriver.cpp ) target_link_libraries(main @@ -50,6 +51,12 @@ PRIVATE "-Wl,--no-whole-archive" ) +target_include_directories(main +PRIVATE + ${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include + ${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include +) + file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/) file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/) file(COPY ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/) diff --git a/Source/Android/jni/GpuDriver.cpp b/Source/Android/jni/GpuDriver.cpp new file mode 100644 index 0000000000..0631ce81cb --- /dev/null +++ b/Source/Android/jni/GpuDriver.cpp @@ -0,0 +1,147 @@ +// Copyright 2023 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +// Based on: Skyline Emulator Project +// SPDX-License-Identifier: MPL-2.0 +// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/) + +#include + +#include "Common/IniFile.h" +#include "jni/AndroidCommon/AndroidCommon.h" +#include "jni/AndroidCommon/IDCache.h" + +#include +#include +#include +#include +#include "adrenotools/driver.h" + +#include "VideoBackends/Vulkan/VulkanContext.h" +#include "VideoBackends/Vulkan/VulkanLoader.h" + +extern "C" { + +#if defined(_M_ARM_64) + +JNIEXPORT jobjectArray JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_getSystemDriverInfo(JNIEnv* env, + jobject) +{ + if (!Vulkan::LoadVulkanLibrary(true)) + { + return nullptr; + } + + u32 vk_api_version = 0; + VkInstance instance = Vulkan::VulkanContext::CreateVulkanInstance(WindowSystemType::Headless, + false, false, &vk_api_version); + if (!instance) + { + return nullptr; + } + + if (!Vulkan::LoadVulkanInstanceFunctions(instance)) + { + vkDestroyInstance(instance, nullptr); + return nullptr; + } + + Vulkan::VulkanContext::GPUList gpu_list = Vulkan::VulkanContext::EnumerateGPUs(instance); + + if (gpu_list.empty()) + { + vkDestroyInstance(instance, nullptr); + Vulkan::UnloadVulkanLibrary(); + return nullptr; + } + + VkPhysicalDeviceProperties properties; + vkGetPhysicalDeviceProperties(gpu_list.front(), &properties); + + std::string driverId; + if (vkGetPhysicalDeviceProperties2 && vk_api_version >= VK_VERSION_1_1) + { + VkPhysicalDeviceDriverProperties driverProperties; + driverProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; + driverProperties.pNext = nullptr; + VkPhysicalDeviceProperties2 properties2; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &driverProperties; + vkGetPhysicalDeviceProperties2(gpu_list.front(), &properties2); + driverId = fmt::format("{}", driverProperties.driverID); + } + else + { + driverId = "Unknown"; + } + + std::string driverVersion = + fmt::format("{}.{}.{}", VK_API_VERSION_MAJOR(properties.driverVersion), + VK_API_VERSION_MINOR(properties.driverVersion), + VK_API_VERSION_PATCH(properties.driverVersion)); + + vkDestroyInstance(instance, nullptr); + Vulkan::UnloadVulkanLibrary(); + + auto array = env->NewObjectArray(2, env->FindClass("java/lang/String"), nullptr); + env->SetObjectArrayElement(array, 0, ToJString(env, driverId)); + env->SetObjectArrayElement(array, 1, ToJString(env, driverVersion)); + return array; +} + +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_supportsCustomDriverLoading( + JNIEnv* env, jobject instance) +{ + // If the KGSL device exists custom drivers can be loaded using adrenotools + return Vulkan::SupportsCustomDriver(); +} + +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_supportsForceMaxGpuClocks( + JNIEnv* env, jobject instance) +{ + // If the KGSL device exists adrenotools can be used to set GPU turbo mode + return Vulkan::SupportsCustomDriver(); +} + +JNIEXPORT void JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_forceMaxGpuClocks( + JNIEnv* env, jobject instance, jboolean enable) +{ + adrenotools_set_turbo(enable); +} + +#else + +JNIEXPORT jobjectArray JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_getSystemDriverInfo( + JNIEnv* env, jobject instance) +{ + auto array = env->NewObjectArray(0, env->FindClass("java/lang/String"), nullptr); + return array; +} + +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_supportsCustomDriverLoading( + JNIEnv* env, jobject instance) +{ + return false; +} + +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_supportsForceMaxGpuClocks( + JNIEnv* env, jobject instance) +{ + return false; +} + +JNIEXPORT void JNICALL +Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_forceMaxGpuClocks( + JNIEnv* env, jobject instance, jboolean enable) +{ +} + +#endif +} diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 30f0f5995e..d73c9f3d75 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -371,6 +371,15 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_utils_DirectoryInitializat File::SetSysDirectory(path); } +JNIEXPORT void JNICALL +Java_org_dolphinemu_dolphinemu_utils_DirectoryInitialization_SetGpuDriverDirectories( + JNIEnv* env, jclass, jstring jPath, jstring jLibPath) +{ + const std::string path = GetJString(env, jPath); + const std::string lib_path = GetJString(env, jLibPath); + File::SetGpuDriverDirectories(path, lib_path); +} + JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory( JNIEnv* env, jclass, jstring jDirectory) { -- cgit v1.2.3