VERY experimental Nintendo Switch 2 emulator
C++
android: Various fixes for CI.
bunnei04eabc45e565
diff --git a/.ci/scripts/android/build.sh b/.ci/scripts/android/build.shindex 1d669919c2..a5fd1ee181 100755--- a/.ci/scripts/android/build.sh+++ b/.ci/scripts/android/build.sh@@ -1,5 +1,8 @@#!/bin/bash -ex+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+export NDK_CCACHE="$(which ccache)"ccache -sdiff --git a/.ci/scripts/android/upload.sh b/.ci/scripts/android/upload.shindex 269684178e..cfaeff3286 100755--- a/.ci/scripts/android/upload.sh+++ b/.ci/scripts/android/upload.sh@@ -1,5 +1,8 @@#!/bin/bash -ex+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+. ./.ci/scripts/common/pre-upload.shREV_NAME="yuzu-${GITDATE}-${GITREV}"diff --git a/.github/workflows/build.yml b/.github/workflows/build.ymlindex 298eb47459..9875de2069 100644--- a/.github/workflows/build.yml+++ b/.github/workflows/build.yml@@ -4,11 +4,8 @@name: 'yuzu verify'on:- push:-# branches: [ main ]- tags: [ "*" ]pull_request:- branches: [ main ]+ branches: [ master ]env:PR_NUMBER: pr${{ github.event.number }}diff --git a/.reuse/dep5 b/.reuse/dep5index 3810f2c418..31178fc4c1 100644--- a/.reuse/dep5+++ b/.reuse/dep5@@ -135,3 +135,15 @@ License: GPL-3.0-or-laterFiles: .github/ISSUE_TEMPLATE/*Copyright: 2022 yuzu Emulator ProjectLicense: GPL-2.0-or-later++Files: src/android/app/src/ea/res/*+Copyright: 2023 yuzu Emulator Project+License: GPL-3.0-or-later++Files: src/android/app/src/main/res/*+Copyright: 2023 yuzu Emulator Project+License: GPL-3.0-or-later++Files: src/android/gradle/wrapper/*+Copyright: 2023 yuzu Emulator Project+License: GPL-3.0-or-laterdiff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txtnew file mode 100644index 0000000000..14e2f777f6--- /dev/null+++ b/LICENSES/MPL-2.0.txt@@ -0,0 +1,373 @@+Mozilla Public License Version 2.0+==================================++1. Definitions+--------------++1.1. "Contributor"+ means each individual or legal entity that creates, contributes to+ the creation of, or owns Covered Software.++1.2. "Contributor Version"+ means the combination of the Contributions of others (if any) used+ by a Contributor and that particular Contributor's Contribution.++1.3. "Contribution"+ means Covered Software of a particular Contributor.++1.4. "Covered Software"+ means Source Code Form to which the initial Contributor has attached+ the notice in Exhibit A, the Executable Form of such Source Code+ Form, and Modifications of such Source Code Form, in each case+ including portions thereof.++1.5. "Incompatible With Secondary Licenses"+ means++ (a) that the initial Contributor has attached the notice described+ in Exhibit B to the Covered Software; or++ (b) that the Covered Software was made available under the terms of+ version 1.1 or earlier of the License, but not also under the+ terms of a Secondary License.++1.6. "Executable Form"+ means any form of the work other than Source Code Form.++1.7. "Larger Work"+ means a work that combines Covered Software with other material, in+ a separate file or files, that is not Covered Software.++1.8. "License"+ means this document.++1.9. "Licensable"+ means having the right to grant, to the maximum extent possible,+ whether at the time of the initial grant or subsequently, any and+ all of the rights conveyed by this License.++1.10. "Modifications"+ means any of the following:++ (a) any file in Source Code Form that results from an addition to,+ deletion from, or modification of the contents of Covered+ Software; or++ (b) any new file in Source Code Form that contains any Covered+ Software.++1.11. "Patent Claims" of a Contributor+ means any patent claim(s), including without limitation, method,+ process, and apparatus claims, in any patent Licensable by such+ Contributor that would be infringed, but for the grant of the+ License, by the making, using, selling, offering for sale, having+ made, import, or transfer of either its Contributions or its+ Contributor Version.++1.12. "Secondary License"+ means either the GNU General Public License, Version 2.0, the GNU+ Lesser General Public License, Version 2.1, the GNU Affero General+ Public License, Version 3.0, or any later versions of those+ licenses.++1.13. "Source Code Form"+ means the form of the work preferred for making modifications.++1.14. "You" (or "Your")+ means an individual or a legal entity exercising rights under this+ License. For legal entities, "You" includes any entity that+ controls, is controlled by, or is under common control with You. For+ purposes of this definition, "control" means (a) the power, direct+ or indirect, to cause the direction or management of such entity,+ whether by contract or otherwise, or (b) ownership of more than+ fifty percent (50%) of the outstanding shares or beneficial+ ownership of such entity.++2. License Grants and Conditions+--------------------------------++2.1. Grants++Each Contributor hereby grants You a world-wide, royalty-free,+non-exclusive license:++(a) under intellectual property rights (other than patent or trademark)+ Licensable by such Contributor to use, reproduce, make available,+ modify, display, perform, distribute, and otherwise exploit its+ Contributions, either on an unmodified basis, with Modifications, or+ as part of a Larger Work; and++(b) under Patent Claims of such Contributor to make, use, sell, offer+ for sale, have made, import, and otherwise transfer either its+ Contributions or its Contributor Version.++2.2. Effective Date++The licenses granted in Section 2.1 with respect to any Contribution+become effective for each Contribution on the date the Contributor first+distributes such Contribution.++2.3. Limitations on Grant Scope++The licenses granted in this Section 2 are the only rights granted under+this License. No additional rights or licenses will be implied from the+distribution or licensing of Covered Software under this License.+Notwithstanding Section 2.1(b) above, no patent license is granted by a+Contributor:++(a) for any code that a Contributor has removed from Covered Software;+ or++(b) for infringements caused by: (i) Your and any other third party's+ modifications of Covered Software, or (ii) the combination of its+ Contributions with other software (except as part of its Contributor+ Version); or++(c) under Patent Claims infringed by Covered Software in the absence of+ its Contributions.++This License does not grant any rights in the trademarks, service marks,+or logos of any Contributor (except as may be necessary to comply with+the notice requirements in Section 3.4).++2.4. Subsequent Licenses++No Contributor makes additional grants as a result of Your choice to+distribute the Covered Software under a subsequent version of this+License (see Section 10.2) or under the terms of a Secondary License (if+permitted under the terms of Section 3.3).++2.5. Representation++Each Contributor represents that the Contributor believes its+Contributions are its original creation(s) or it has sufficient rights+to grant the rights to its Contributions conveyed by this License.++2.6. Fair Use++This License is not intended to limit any rights You have under+applicable copyright doctrines of fair use, fair dealing, or other+equivalents.++2.7. Conditions++Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted+in Section 2.1.++3. Responsibilities+-------------------++3.1. Distribution of Source Form++All distribution of Covered Software in Source Code Form, including any+Modifications that You create or to which You contribute, must be under+the terms of this License. You must inform recipients that the Source+Code Form of the Covered Software is governed by the terms of this+License, and how they can obtain a copy of this License. You may not+attempt to alter or restrict the recipients' rights in the Source Code+Form.++3.2. Distribution of Executable Form++If You distribute Covered Software in Executable Form then:++(a) such Covered Software must also be made available in Source Code+ Form, as described in Section 3.1, and You must inform recipients of+ the Executable Form how they can obtain a copy of such Source Code+ Form by reasonable means in a timely manner, at a charge no more+ than the cost of distribution to the recipient; and++(b) You may distribute such Executable Form under the terms of this+ License, or sublicense it under different terms, provided that the+ license for the Executable Form does not attempt to limit or alter+ the recipients' rights in the Source Code Form under this License.++3.3. Distribution of a Larger Work++You may create and distribute a Larger Work under terms of Your choice,+provided that You also comply with the requirements of this License for+the Covered Software. If the Larger Work is a combination of Covered+Software with a work governed by one or more Secondary Licenses, and the+Covered Software is not Incompatible With Secondary Licenses, this+License permits You to additionally distribute such Covered Software+under the terms of such Secondary License(s), so that the recipient of+the Larger Work may, at their option, further distribute the Covered+Software under the terms of either this License or such Secondary+License(s).++3.4. Notices++You may not remove or alter the substance of any license notices+(including copyright notices, patent notices, disclaimers of warranty,+or limitations of liability) contained within the Source Code Form of+the Covered Software, except that You may alter any license notices to+the extent required to remedy known factual inaccuracies.++3.5. Application of Additional Terms++You may choose to offer, and to charge a fee for, warranty, support,+indemnity or liability obligations to one or more recipients of Covered+Software. However, You may do so only on Your own behalf, and not on+behalf of any Contributor. You must make it absolutely clear that any+such warranty, support, indemnity, or liability obligation is offered by+You alone, and You hereby agree to indemnify every Contributor for any+liability incurred by such Contributor as a result of warranty, support,+indemnity or liability terms You offer. You may include additional+disclaimers of warranty and limitations of liability specific to any+jurisdiction.++4. Inability to Comply Due to Statute or Regulation+---------------------------------------------------++If it is impossible for You to comply with any of the terms of this+License with respect to some or all of the Covered Software due to+statute, judicial order, or regulation then You must: (a) comply with+the terms of this License to the maximum extent possible; and (b)+describe the limitations and the code they affect. Such description must+be placed in a text file included with all distributions of the Covered+Software under this License. Except to the extent prohibited by statute+or regulation, such description must be sufficiently detailed for a+recipient of ordinary skill to be able to understand it.++5. Termination+--------------++5.1. The rights granted under this License will terminate automatically+if You fail to comply with any of its terms. However, if You become+compliant, then the rights granted under this License from a particular+Contributor are reinstated (a) provisionally, unless and until such+Contributor explicitly and finally terminates Your grants, and (b) on an+ongoing basis, if such Contributor fails to notify You of the+non-compliance by some reasonable means prior to 60 days after You have+come back into compliance. Moreover, Your grants from a particular+Contributor are reinstated on an ongoing basis if such Contributor+notifies You of the non-compliance by some reasonable means, this is the+first time You have received notice of non-compliance with this License+from such Contributor, and You become compliant prior to 30 days after+Your receipt of the notice.++5.2. If You initiate litigation against any entity by asserting a patent+infringement claim (excluding declaratory judgment actions,+counter-claims, and cross-claims) alleging that a Contributor Version+directly or indirectly infringes any patent, then the rights granted to+You by any and all Contributors for the Covered Software under Section+2.1 of this License shall terminate.++5.3. In the event of termination under Sections 5.1 or 5.2 above, all+end user license agreements (excluding distributors and resellers) which+have been validly granted by You or Your distributors under this License+prior to termination shall survive termination.++************************************************************************+* *+* 6. Disclaimer of Warranty *+* ------------------------- *+* *+* Covered Software is provided under this License on an "as is" *+* basis, without warranty of any kind, either expressed, implied, or *+* statutory, including, without limitation, warranties that the *+* Covered Software is free of defects, merchantable, fit for a *+* particular purpose or non-infringing. The entire risk as to the *+* quality and performance of the Covered Software is with You. *+* Should any Covered Software prove defective in any respect, You *+* (not any Contributor) assume the cost of any necessary servicing, *+* repair, or correction. This disclaimer of warranty constitutes an *+* essential part of this License. No use of any Covered Software is *+* authorized under this License except under this disclaimer. *+* *+************************************************************************++************************************************************************+* *+* 7. Limitation of Liability *+* -------------------------- *+* *+* Under no circumstances and under no legal theory, whether tort *+* (including negligence), contract, or otherwise, shall any *+* Contributor, or anyone who distributes Covered Software as *+* permitted above, be liable to You for any direct, indirect, *+* special, incidental, or consequential damages of any character *+* including, without limitation, damages for lost profits, loss of *+* goodwill, work stoppage, computer failure or malfunction, or any *+* and all other commercial damages or losses, even if such party *+* shall have been informed of the possibility of such damages. This *+* limitation of liability shall not apply to liability for death or *+* personal injury resulting from such party's negligence to the *+* extent applicable law prohibits such limitation. Some *+* jurisdictions do not allow the exclusion or limitation of *+* incidental or consequential damages, so this exclusion and *+* limitation may not apply to You. *+* *+************************************************************************++8. Litigation+-------------++Any litigation relating to this License may be brought only in the+courts of a jurisdiction where the defendant maintains its principal+place of business and such litigation shall be governed by laws of that+jurisdiction, without reference to its conflict-of-law provisions.+Nothing in this Section shall prevent a party's ability to bring+cross-claims or counter-claims.++9. Miscellaneous+----------------++This License represents the complete agreement concerning the subject+matter hereof. If any provision of this License is held to be+unenforceable, such provision shall be reformed only to the extent+necessary to make it enforceable. Any law or regulation which provides+that the language of a contract shall be construed against the drafter+shall not be used to construe this License against a Contributor.++10. Versions of the License+---------------------------++10.1. New Versions++Mozilla Foundation is the license steward. Except as provided in Section+10.3, no one other than the license steward has the right to modify or+publish new versions of this License. Each version will be given a+distinguishing version number.++10.2. Effect of New Versions++You may distribute the Covered Software under the terms of the version+of the License under which You originally received the Covered Software,+or under the terms of any subsequent version published by the license+steward.++10.3. Modified Versions++If you create software not governed by this License, and you want to+create a new license for such software, you may create and use a+modified version of this License if you rename the license and remove+any references to the name of the license steward (except to note that+such modified license differs from this License).++10.4. Distributing Source Code Form that is Incompatible With Secondary+Licenses++If You choose to distribute Source Code Form that is Incompatible With+Secondary Licenses under the terms of this version of the License, the+notice described in Exhibit B of this License must be attached.++Exhibit A - Source Code Form License Notice+-------------------------------------------++ This Source Code Form is subject to the terms of the Mozilla Public+ License, v. 2.0. If a copy of the MPL was not distributed with this+ file, You can obtain one at http://mozilla.org/MPL/2.0/.++If it is not possible or desirable to put the notice in a particular+file, then You may include the notice in a location (such as a LICENSE+file in a relevant directory) where a recipient would be likely to look+for such a notice.++You may add additional accurate notices of copyright ownership.++Exhibit B - "Incompatible With Secondary Licenses" Notice+---------------------------------------------------------++ This Source Code Form is "Incompatible With Secondary Licenses", as+ defined by the Mozilla Public License, v. 2.0.diff --git a/src/android/.gitignore b/src/android/.gitignoreindex 40b6c5cd05..121cc84843 100644--- a/src/android/.gitignore+++ b/src/android/.gitignore@@ -1,3 +1,6 @@+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+# Built application files*.apk*.ap_diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex 4aa19c91ac..ec5f787469 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+plugins {id("com.android.application")id("org.jetbrains.kotlin.android")diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.proindex 13cfff1ba9..691e08fd03 100644--- a/src/android/app/proguard-rules.pro+++ b/src/android/app/proguard-rules.pro@@ -1,3 +1,6 @@+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+# To get usable stack traces-dontobfuscatediff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xmlindex aed7f9dc4e..43087f2c01 100644--- a/src/android/app/src/main/AndroidManifest.xml+++ b/src/android/app/src/main/AndroidManifest.xml@@ -1,4 +1,10 @@<?xml version="1.0" encoding="utf-8"?>++<!--+SPDX-FileCopyrightText: 2023 yuzu Emulator Project+SPDX-License-Identifier: GPL-3.0-or-later+-->+<manifest xmlns:android="http://schemas.android.com/apk/res/android"><uses-featureandroid:name="android.hardware.touchscreen"diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.ktindex b959ae4bae..263ee7144d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+package org.yuzu.yuzu_emu.modelimport androidx.lifecycle.LiveDatadiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.ktindex 95f358c219..f0b0af9e57 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt@@ -866,9 +866,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context* Initializes an [InputOverlayDrawableDpad]** @param context The current [Context].- * @param defaultResId The [Bitmap] resource ID of the default sate.- * @param pressedOneDirectionResId The [Bitmap] resource ID of the pressed sate in one direction.- * @param pressedTwoDirectionsResId The [Bitmap] resource ID of the pressed sate in two directions.+ * @param defaultResId The [Bitmap] resource ID of the default state.+ * @param pressedOneDirectionResId The [Bitmap] resource ID of the pressed state in one direction.+ * @param pressedTwoDirectionsResId The [Bitmap] resource ID of the pressed state in two directions.* @return the initialized [InputOverlayDrawableDpad]*/private fun initializeOverlayDpad(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.ktindex 78b978fb5f..24e999b292 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+package org.yuzu.yuzu_emu.utilsimport android.view.KeyEventdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.ktindex e587fea061..19c53c4814 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+package org.yuzu.yuzu_emu.utilsimport android.annotation.SuppressLintdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.ktindex 1ce220d420..344dd8a0ad 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+package org.yuzu.yuzu_emu.utilsimport android.app.Activitydiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.ktindex 23ffbaf689..87ee7f2e61 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+package org.yuzu.yuzu_emu.utilsimport android.content.Intentdiff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txtindex 3cf36b7d18..0417815770 100644--- a/src/android/app/src/main/jni/CMakeLists.txt+++ b/src/android/app/src/main/jni/CMakeLists.txt@@ -1,3 +1,6 @@+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+add_library(yuzu-android SHAREDandroid_common/android_common.cppandroid_common/android_common.hdiff --git a/src/android/app/src/main/jni/applets/software_keyboard.cpp b/src/android/app/src/main/jni/applets/software_keyboard.cppindex c6fffbbab5..74e040478f 100644--- a/src/android/app/src/main/jni/applets/software_keyboard.cpp+++ b/src/android/app/src/main/jni/applets/software_keyboard.cpp@@ -263,9 +263,9 @@ void InitJNI(JNIEnv* env) {s_software_keyboard_class, "executeNormal","(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/yuzu/yuzu_emu/""applets/keyboard/SoftwareKeyboard$KeyboardData;");- s_swkbd_execute_inline =- env->GetStaticMethodID(s_software_keyboard_class, "executeInline",- "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V");+ s_swkbd_execute_inline = env->GetStaticMethodID(+ s_software_keyboard_class, "executeInline",+ "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V");}void CleanupJNI(JNIEnv* env) {diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cppindex 6b4c08145e..2d622a048c 100644--- a/src/android/app/src/main/jni/config.cpp+++ b/src/android/app/src/main/jni/config.cpp@@ -232,7 +232,8 @@ void Config::ReadValues() {Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false);// Enable asynchronous presentation by default on Android- Settings::values.async_presentation = config->GetBoolean("Renderer", "async_presentation", true);+ Settings::values.async_presentation =+ config->GetBoolean("Renderer", "async_presentation", true);// Enable force_max_clock by default on AndroidSettings::values.renderer_force_max_clock =diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cppindex 926bb30e85..a890c66042 100644--- a/src/android/app/src/main/jni/emu_window/emu_window.cpp+++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+#include <android/native_window_jni.h>#include "common/logging/log.h"diff --git a/src/android/app/src/main/jni/emu_window/emu_window.h b/src/android/app/src/main/jni/emu_window/emu_window.hindex 36d46eb510..b38087f738 100644--- a/src/android/app/src/main/jni/emu_window/emu_window.h+++ b/src/android/app/src/main/jni/emu_window/emu_window.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+#pragma once#include <memory>diff --git a/src/android/app/src/main/jni/id_cache.cpp b/src/android/app/src/main/jni/id_cache.cppindex 7edadb94a5..9cbbf23a33 100644--- a/src/android/app/src/main/jni/id_cache.cpp+++ b/src/android/app/src/main/jni/id_cache.cpp@@ -107,7 +107,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {env->DeleteGlobalRef(s_disk_cache_progress_class);env->DeleteGlobalRef(s_load_callback_stage_class);- // UnInitialze applets+ // UnInitialize appletsSoftwareKeyboard::CleanupJNI(env);}diff --git a/src/android/app/src/main/jni/id_cache.h b/src/android/app/src/main/jni/id_cache.hindex 9337cd2542..be535fe1e3 100644--- a/src/android/app/src/main/jni/id_cache.h+++ b/src/android/app/src/main/jni/id_cache.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+#pragma once#include <jni.h>diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cppindex a7321af2a9..bbe6abdb0a 100644--- a/src/android/app/src/main/jni/native.cpp+++ b/src/android/app/src/main/jni/native.cpp@@ -37,8 +37,8 @@#include "core/frontend/applets/profile_select.h"#include "core/frontend/applets/software_keyboard.h"#include "core/frontend/applets/web_browser.h"-#include "core/hid/hid_core.h"#include "core/hid/emulated_controller.h"+#include "core/hid/hid_core.h"#include "core/hid/hid_types.h"#include "core/hle/service/acc/profile_manager.h"#include "core/hle/service/am/applet_ae.h"@@ -276,7 +276,7 @@ public:m_rom_metadata_cache.clear();}- bool IsHandheldOnly(){+ bool IsHandheldOnly() {const auto npad_style_set = m_system.HIDCore().GetSupportedStyleTag();if (npad_style_set.fullkey == 1) {@@ -290,42 +290,43 @@ public:return !Settings::values.use_docked_mode.GetValue();}- void SetDeviceType(int index, int type){+ void SetDeviceType(int index, int type) {auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);controller->SetNpadStyleIndex(static_cast<Core::HID::NpadStyleIndex>(type));}- void OnGamepadConnectEvent(int index){+ void OnGamepadConnectEvent(int index) {auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);// Ensure that player1 is configured correctly and handheld disconnected- if(controller->GetNpadIdType() == Core::HID::NpadIdType::Player1){- auto handheld = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);-- if(controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) {- handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);- controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);- handheld->Disconnect();- }+ if (controller->GetNpadIdType() == Core::HID::NpadIdType::Player1) {+ auto handheld =+ m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);++ if (controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) {+ handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);+ controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);+ handheld->Disconnect();+ }}// Ensure that handheld is configured correctly and player 1 disconnected- if(controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld){+ if (controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld) {auto player1 = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);- if(controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) {+ if (controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) {player1->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);player1->Disconnect();}}- if(!controller->IsConnected()){+ if (!controller->IsConnected()) {controller->Connect();}}- void OnGamepadDisconnectEvent(int index){+ void OnGamepadDisconnectEvent(int index) {auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);controller->Disconnect();}@@ -497,14 +498,13 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv}jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+ [[maybe_unused]] jclass clazz) {return EmulationSession::GetInstance().IsHandheldOnly();}jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNIEnv* env,[[maybe_unused]] jclass clazz,- jint j_device,- jint j_type) {+ jint j_device, jint j_type) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().SetDeviceType(j_device, j_type);}@@ -512,17 +512,16 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JN}jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,- jint j_device) {+ [[maybe_unused]] jclass clazz,+ jint j_device) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().OnGamepadConnectEvent(j_device);}return static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,- jint j_device) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(+ [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().OnGamepadDisconnectEvent(j_device);}@@ -562,10 +561,11 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent(return static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jbyteArray j_data) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag([[maybe_unused]] JNIEnv* env,+ [[maybe_unused]] jclass clazz,+ jbyteArray j_data) {jboolean isCopy{false};- std::span<u8> data(reinterpret_cast<u8 *>(env->GetByteArrayElements(j_data, &isCopy)),+ std::span<u8> data(reinterpret_cast<u8*>(env->GetByteArrayElements(j_data, &isCopy)),static_cast<size_t>(env->GetArrayLength(j_data)));if (EmulationSession::GetInstance().IsRunning()) {@@ -574,8 +574,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(return static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag([[maybe_unused]] JNIEnv* env,+ [[maybe_unused]] jclass clazz) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnRemoveNfcTag();}diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.hindex d1e382a33f..24dcbbcb8e 100644--- a/src/android/app/src/main/jni/native.h+++ b/src/android/app/src/main/jni/native.h@@ -25,17 +25,19 @@ JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ResetRomMetadata(JNJNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_IsRunning(JNIEnv* env,jclass clazz);-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(- JNIEnv* env, jclass clazz);+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env,+ jclass clazz);-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(- JNIEnv* env, jclass clazz, jstring j_device, jstring j_type);+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env,+ jclass clazz,+ jstring j_device,+ jstring j_type);JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(- JNIEnv* env, jclass clazz, jstring j_device);+ JNIEnv* env, jclass clazz, jstring j_device);JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(- JNIEnv* env, jclass clazz, jstring j_device);+ JNIEnv* env, jclass clazz, jstring j_device);JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadEvent(JNIEnv* env, jclass clazz, jstring j_device, jint j_button, jint action);@@ -44,13 +46,14 @@ JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMoveEvJNIEnv* env, jclass clazz, jstring j_device, jint axis, jfloat x, jfloat y);JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadAxisEvent(- JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val);+ JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val);-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(- JNIEnv* env, jclass clazz, jbyteArray j_data);+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env,+ jclass clazz,+ jbyteArray j_data);-JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(- JNIEnv* env, jclass clazz);+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env,+ jclass clazz);JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchEvent(JNIEnv* env,jclass clazz,diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex dd1137b69e..cffa3ff0bd 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -78,7 +78,7 @@<string name="open_user_folder_description">Manage yuzu\'s internal files</string><string name="theme_and_color_description">Modify the look of the app</string><string name="no_file_manager">No file manager found</string>- <string name="notification_no_directory_link">Couldn\'t open yuzu directory</string>+ <string name="notification_no_directory_link">Could not open yuzu directory</string><string name="notification_no_directory_link_description">Please locate the user folder with the file manager\'s side panel manually.</string><!-- About screen strings -->@@ -249,7 +249,7 @@<string name="language_latin_american_spanish">Latin American Spanish (Español latinoamericano)</string><string name="language_simplified_chinese">Simplified Chinese (简体中文)</string><string name="language_traditional_chinese">Traditional Chinese (正體中文)</string>- <string name="language_brazilian_portuguese">Brazilian Portuguese (Portugues do Brasil)</string>+ <string name="language_brazilian_portuguese">Brazilian Portuguese (Português do Brasil)</string><!-- Renderer APIs --><string name="renderer_vulkan">Vulkan</string>diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.ktsindex 1ed9aed9ad..e19e8ce58e 100644--- a/src/android/build.gradle.kts+++ b/src/android/build.gradle.kts@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// Top-level build file where you can add configuration options common to all sub-projects/modules.plugins {id("com.android.application") version "8.0.2" apply falsediff --git a/src/android/gradle.properties b/src/android/gradle.propertiesindex bf63cfce71..653a35ce8a 100644--- a/src/android/gradle.properties+++ b/src/android/gradle.properties@@ -1,3 +1,6 @@+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+# Project-wide Gradle settings.# IDE (e.g. Android Studio) users:# Gradle settings configured through the IDE *will override*diff --git a/src/android/gradlew b/src/android/gradlewindex cccdd3d517..afa1279664 100755--- a/src/android/gradlew+++ b/src/android/gradlew@@ -1,5 +1,8 @@#!/usr/bin/env sh+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+################################################################################## Gradle start up script for UN*Xdiff --git a/src/android/gradlew.bat b/src/android/gradlew.batindex f9553162f1..be152d1088 100644--- a/src/android/gradlew.bat+++ b/src/android/gradlew.bat@@ -1,3 +1,6 @@+@rem SPDX-FileCopyrightText: 2023 yuzu Emulator Project+@rem SPDX-License-Identifier: GPL-3.0-or-later+@if "%DEBUG%" == "" @echo off@rem ##########################################################################@remdiff --git a/src/android/settings.gradle.kts b/src/android/settings.gradle.ktsindex 1fb82df416..af910b9068 100644--- a/src/android/settings.gradle.kts+++ b/src/android/settings.gradle.kts@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+pluginManagement {repositories {gradlePluginPortal()diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cppindex 9505179c6a..c08f21e2c9 100644--- a/src/input_common/drivers/virtual_amiibo.cpp+++ b/src/input_common/drivers/virtual_amiibo.cpp@@ -107,19 +107,19 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(std::span<u8> data) {}switch (data.size_bytes()) {- case AmiiboSize:- case AmiiboSizeWithoutPassword:- nfc_data.resize(AmiiboSize);- break;- case MifareSize:- nfc_data.resize(MifareSize);- break;- default:- return Info::NotAnAmiibo;+ case AmiiboSize:+ case AmiiboSizeWithoutPassword:+ nfc_data.resize(AmiiboSize);+ break;+ case MifareSize:+ nfc_data.resize(MifareSize);+ break;+ default:+ return Info::NotAnAmiibo;}state = State::AmiiboIsOpen;- memcpy(nfc_data.data(),data.data(),data.size_bytes());+ memcpy(nfc_data.data(), data.data(), data.size_bytes());SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, nfc_data});return Info::Success;}