mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-11-19 13:59:57 +00:00
android: Don't show custom driver button on mali and x86
This commit is contained in:
parent
a67bdeb2c2
commit
e684515578
3 changed files with 123 additions and 71 deletions
|
@ -68,44 +68,65 @@ class HomeSettingsFragment : Fragment() {
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
mainActivity = requireActivity() as MainActivity
|
mainActivity = requireActivity() as MainActivity
|
||||||
|
|
||||||
val optionsList: MutableList<HomeSetting> = mutableListOf(
|
val optionsList: MutableList<HomeSetting> = mutableListOf<HomeSetting>().apply {
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.advanced_settings,
|
R.string.advanced_settings,
|
||||||
R.string.settings_description,
|
R.string.settings_description,
|
||||||
R.drawable.ic_settings
|
R.drawable.ic_settings
|
||||||
) { SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "") },
|
) { SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "") }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.open_user_folder,
|
R.string.open_user_folder,
|
||||||
R.string.open_user_folder_description,
|
R.string.open_user_folder_description,
|
||||||
R.drawable.ic_folder_open
|
R.drawable.ic_folder_open
|
||||||
) { openFileManager() },
|
) { openFileManager() }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.preferences_theme,
|
R.string.preferences_theme,
|
||||||
R.string.theme_and_color_description,
|
R.string.theme_and_color_description,
|
||||||
R.drawable.ic_palette
|
R.drawable.ic_palette
|
||||||
) { SettingsActivity.launch(requireContext(), Settings.SECTION_THEME, "") },
|
) { SettingsActivity.launch(requireContext(), Settings.SECTION_THEME, "") }
|
||||||
|
)
|
||||||
|
|
||||||
|
if (GpuDriverHelper.supportsCustomDriverLoading()) {
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.install_gpu_driver,
|
R.string.install_gpu_driver,
|
||||||
R.string.install_gpu_driver_description,
|
R.string.install_gpu_driver_description,
|
||||||
R.drawable.ic_exit
|
R.drawable.ic_exit
|
||||||
) { driverInstaller() },
|
) { driverInstaller() }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.install_amiibo_keys,
|
R.string.install_amiibo_keys,
|
||||||
R.string.install_amiibo_keys_description,
|
R.string.install_amiibo_keys_description,
|
||||||
R.drawable.ic_nfc
|
R.drawable.ic_nfc
|
||||||
) { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) },
|
) { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.install_game_content,
|
R.string.install_game_content,
|
||||||
R.string.install_game_content_description,
|
R.string.install_game_content_description,
|
||||||
R.drawable.ic_system_update_alt
|
R.drawable.ic_system_update_alt
|
||||||
) { mainActivity.installGameUpdate.launch(arrayOf("*/*")) },
|
) { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.select_games_folder,
|
R.string.select_games_folder,
|
||||||
R.string.select_games_folder_description,
|
R.string.select_games_folder_description,
|
||||||
R.drawable.ic_add
|
R.drawable.ic_add
|
||||||
) {
|
) {
|
||||||
mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
|
mainActivity.getGamesDirectory.launch(
|
||||||
},
|
Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.manage_save_data,
|
R.string.manage_save_data,
|
||||||
R.string.import_export_saves_description,
|
R.string.import_export_saves_description,
|
||||||
|
@ -115,22 +136,30 @@ class HomeSettingsFragment : Fragment() {
|
||||||
parentFragmentManager,
|
parentFragmentManager,
|
||||||
ImportExportSavesFragment.TAG
|
ImportExportSavesFragment.TAG
|
||||||
)
|
)
|
||||||
},
|
}
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.install_prod_keys,
|
R.string.install_prod_keys,
|
||||||
R.string.install_prod_keys_description,
|
R.string.install_prod_keys_description,
|
||||||
R.drawable.ic_unlock
|
R.drawable.ic_unlock
|
||||||
) { mainActivity.getProdKey.launch(arrayOf("*/*")) },
|
) { mainActivity.getProdKey.launch(arrayOf("*/*")) }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.install_firmware,
|
R.string.install_firmware,
|
||||||
R.string.install_firmware_description,
|
R.string.install_firmware_description,
|
||||||
R.drawable.ic_firmware
|
R.drawable.ic_firmware
|
||||||
) { mainActivity.getFirmware.launch(arrayOf("application/zip")) },
|
) { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.share_log,
|
R.string.share_log,
|
||||||
R.string.share_log_description,
|
R.string.share_log_description,
|
||||||
R.drawable.ic_log
|
R.drawable.ic_log
|
||||||
) { shareLog() },
|
) { shareLog() }
|
||||||
|
)
|
||||||
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.about,
|
R.string.about,
|
||||||
R.string.about_description,
|
R.string.about_description,
|
||||||
|
@ -141,6 +170,7 @@ class HomeSettingsFragment : Fragment() {
|
||||||
?.navigate(R.id.action_homeSettingsFragment_to_aboutFragment)
|
?.navigate(R.id.action_homeSettingsFragment_to_aboutFragment)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
if (!BuildConfig.PREMIUM) {
|
if (!BuildConfig.PREMIUM) {
|
||||||
optionsList.add(
|
optionsList.add(
|
||||||
|
|
|
@ -113,6 +113,8 @@ object GpuDriverHelper {
|
||||||
initializeDriverParameters(context)
|
initializeDriverParameters(context)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
external fun supportsCustomDriverLoading(): Boolean
|
||||||
|
|
||||||
// Parse the custom driver metadata to retrieve the name.
|
// Parse the custom driver metadata to retrieve the name.
|
||||||
val customDriverName: String?
|
val customDriverName: String?
|
||||||
get() {
|
get() {
|
||||||
|
|
|
@ -560,6 +560,26 @@ void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(
|
||||||
GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
|
GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[[maybe_unused]] static bool CheckKgslPresent() {
|
||||||
|
constexpr auto KgslPath{"/dev/kgsl-3d0"};
|
||||||
|
|
||||||
|
return access(KgslPath, F_OK) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[maybe_unused]] bool SupportsCustomDriver() {
|
||||||
|
return android_get_device_api_level() >= 28 && CheckKgslPresent();
|
||||||
|
}
|
||||||
|
|
||||||
|
jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading(
|
||||||
|
[[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject instance) {
|
||||||
|
#ifdef ARCHITECTURE_arm64
|
||||||
|
// If the KGSL device exists custom drivers can be loaded using adrenotools
|
||||||
|
return SupportsCustomDriver();
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env,
|
jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env,
|
||||||
[[maybe_unused]] jclass clazz) {
|
[[maybe_unused]] jclass clazz) {
|
||||||
Core::Crypto::KeyManager::Instance().ReloadKeys();
|
Core::Crypto::KeyManager::Instance().ReloadKeys();
|
||||||
|
|
Loading…
Reference in a new issue