Merge branch 'Exverge-use-system-moltenvk' into dev

Co-authored-by: Nick Majkic <8842171-majkic65@users.noreply.gitlab.com>

.ci/scripts/linux/docker.sh

@@ -12,6 +12,8 @@ mkdir build || true && cd build
 cmake .. \
       -DBoost_USE_STATIC_LIBS=ON \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+			-DSUYU_USE_PRECOMPILED_HEADERS=OFF \
+			-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
       -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
       -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
       -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \

.gitignore

@@ -4,6 +4,7 @@
 # Build directory
 [Bb]uild*/
 doc-build/
+cmake-build*/
 
 # Generated source files
 src/common/scm_rev.cpp

.gitlab-ci.yml

@@ -1,6 +1,22 @@
 stages:
   - format
   - build
+
+variables:
+  # https://docs.gitlab.com/ee/ci/runners/configure_runners.html
+  TRANSFER_METER_FREQUENCY: "2s"
+  ARTIFACT_COMPRESSION_LEVEL: "fast"
+  CACHE_COMPRESSION_LEVEL: "fastest"
+  CACHE_REQUEST_TIMEOUT: 5
+  # Use FASTZIP for faster compression in cache and artifacts (boolean)
+  # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
+  FF_USE_FASTZIP: 1
+  
+  # Our Variables
+  CACHE_DIR: "$CI_PROJECT_DIR/ccache"
+  CCACHE_DIR: $CACHE_DIR
+
+
 #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES
 clang-format:
   stage: format
@@ -15,11 +31,21 @@ clang-format:
   #  - Linux
   #  - Windows
     - Parallelized
+    - Format
+
 #LINUX BUILD - BUILDS LINUX APPIMAGE
 build-linux:
   stage: build
   image: suyuemu/cibuild:linux-x64
   resource_group: linux-ci
+  cache:
+    key: "$CI_COMMIT_REF_NAME-ccache"
+    paths:
+      - $CACHE_DIR
+  before_script:
+    - mkdir -p $CACHE_DIR
+    - chmod -R 777 $CACHE_DIR
+    - ls -la $CACHE_DIR
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_SUBMODULE_DEPTH: 1
@@ -33,6 +59,7 @@ build-linux:
   tags:
     - Linux
     - Parallelized
+
 #ANDROID BUILD - BUILDS APK
 android:
   stage: build
@@ -51,5 +78,6 @@ android:
     paths:
       - artifacts/*
   tags:
-    - Linux
+    - Android
     - Parallelized
+

CMakeLists.txt

@@ -3,6 +3,9 @@
 
 cmake_minimum_required(VERSION 3.22)
 
+set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT OFF)
+set(CMAKE_XCODE_EMIT_RELATIVE_PATH YES)
+
 project(suyu)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")

CONTRIBUTING.md

@@ -5,5 +5,5 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 Please check out the
 
- * [Conributors's guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing).
+ * [Contributors's guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing).
  * [Merge request guidelines](https://gitlab.com/suyu-emu/suyu/-/wikis/Merge-requests)

README.md

@@ -51,10 +51,12 @@ You can also contact any of the developers on Discord to learn more about the cu
 
 ## Downloads
 
-* __Windows__: WIP
-* __Linux__: WIP
+* __Windows__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __Linux__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __macOS__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __Android__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
 
-We don't have any official builds yet! If any website or person is claiming to have a build for suyu, take that with a grain of salt, because it might contain malware. Until we do have an official build, it might be a better idea to keep using the last version of yuzu.
+We have official builds [here.](https://gitlab.com/suyu-emu/suyu/-/releases) If any website or person is claiming to have a build for suyu, take that with a grain of salt.
 
 ## Building
 

dist/icns_generator.sh

@@ -1,14 +1,72 @@
-mkdir suyu.iconset
-convert  -background none -resize 16x16 suyu.svg suyu.iconset/icon_16x16.png;
-convert  -background none -resize 32x32 suyu.svg suyu.iconset/icon_16x16@2x.png;
-convert  -background none -resize 32x32 suyu.svg suyu.iconset/icon_32x32.png;
-convert  -background none -resize 64x64 suyu.svg suyu.iconset/icon_32x32@2x.png;
-convert  -background none -resize 128x128 suyu.svg suyu.iconset/icon_128x128.png;
-convert  -background none -resize 256x256 suyu.svg suyu.iconset/icon_256x256.png;
-convert  -background none -resize 256x256 suyu.svg suyu.iconset/icon_128x128@2x.png;
-convert  -background none -resize 512x512 suyu.svg suyu.iconset/icon_256x256@2x.png;
-convert  -background none -resize 512x512 suyu.svg suyu.iconset/icon_512x512.png;
-convert  -background none -resize 1024x1024 suyu.svg suyu.iconset/icon_512x512@2x.png;
+#!/bin/bash
+# icns_generator.sh    GNU GPLv3 License
+# Run this script when a new logo is made and the svg file inside.
+# You should install Imagemagick to make the conversions: $brew install imagemagick
 
-iconutil -c icns suyu.iconset
-rm -rf suyu.iconset
+# Change working dir to where this script is located.
+cd "${0%/*}"
+
+if [ -z $1 ]; then
+    echo "icns_generator.sh    GNU GPLv3 License"
+    echo "Run this script when a new logo is made and the svg file inside."
+    echo ""
+    echo "Syntax: ./icns_generator <input.svg>"
+    echo ""
+    echo "Don't forget to install imagemagick: "
+    echo "$ brew install imagemagick"
+    exit 0
+fi
+
+# Error Handling Stuff: 
+## Check command availability
+check_command() {
+    if ! command -v "$1" &> /dev/null; then
+        read -s -n 1 -p "Error: '$1' command not found. Please install $2."
+        exit 1
+    fi
+}
+
+## Convert image with error handling
+convert_image() {
+    convert -background none -resize "$2" "$1" "$3" || {
+        read -s -n 1 -p "Error: Conversion failed for $1"
+        exit 1
+    }
+}
+
+# Check required commands
+check_command "convert" "ImageMagick"
+check_command "iconutil" "macOS"
+
+# Create the iconset directory
+mkdir suyu.iconset || {
+    read -s -n 1 -p "Error: Unable to create suyu.iconset directory."
+    exit 1
+}
+
+# Convert images
+convert_image "$1" 16x16 suyu.iconset/icon_16x16.png
+convert_image "$1" 32x32 suyu.iconset/icon_16x16@2x.png
+convert_image "$1" 32x32 suyu.iconset/icon_32x32.png
+convert_image "$1" 64x64 suyu.iconset/icon_32x32@2x.png
+convert_image "$1" 128x128 suyu.iconset/icon_128x128.png
+convert_image "$1" 256x256 suyu.iconset/icon_256x256.png
+convert_image "$1" 256x256 suyu.iconset/icon_128x128@2x.png
+convert_image "$1" 512x512 suyu.iconset/icon_256x256@2x.png
+convert_image "$1" 512x512 suyu.iconset/icon_512x512.png
+convert_image "$1" 1024x1024 suyu.iconset/icon_512x512@2x.png
+
+# Create the ICNS file
+iconutil -c icns suyu.iconset || {
+    read -s -n 1 -p "Error: Failed to create ICNS file."
+    exit 1
+}
+
+# Remove the temporary iconset directory
+rm -rf suyu.iconset || {
+    read -s -n 1 -p "Error: Unable to remove suyu.iconset directory."
+    exit 1
+}
+
+echo -s -n 1 -p "Icon generation completed successfully."
+echo ""

src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AppletLauncherFragment.kt

@@ -72,6 +72,12 @@ class AppletLauncherFragment : Fragment() {
                 R.string.mii_edit_applet_description,
                 R.drawable.ic_mii,
                 AppletInfo.MiiEdit
+            ),
+            Applet(
+                R.string.qlaunch_applet,
+                R.string.qlaunch_description,
+                R.drawable.ic_home,
+                AppletInfo.QLaunch
             )
         )
 

src/android/app/src/main/java/org/suyu/suyu_emu/model/Applet.kt

@@ -20,7 +20,7 @@ enum class AppletInfo(val appletId: Int, val entryId: Long = 0) {
     None(0x00),
     Application(0x01),
     OverlayDisplay(0x02),
-    QLaunch(0x03),
+    QLaunch(0x03, 0x0100000000001000),
     Starter(0x04),
     Auth(0x0A),
     Cabinet(0x0B, 0x0100000000001002),

src/android/app/src/main/res/drawable/ic_home.xml

@@ -0,0 +1,10 @@
+<vector android:alpha="1"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="M21.59,11.31 L12.41,2.9a0.55,0.55 0,0 0,-0.75 0L2.47,11.31a0.54,0.54 0,0 0,0.38 0.93H4.41a0.35,0.35 0,0 1,0.35 0.35V20.32a0.54,0.54 0,0 0,0.54 0.54H18.77a0.54,0.54 0,0 0,0.54 -0.54V12.58a0.35,0.35 0,0 1,0.35 -0.35H21.21A0.54,0.54 0,0 0,21.59 11.31ZM15,16.65a0.43,0.43 0,0 1,-0.43 0.43H9.5a0.43,0.43 0,0 1,-0.43 -0.43V12.66a0.43,0.43 0,0 1,0.43 -0.43H14.56a0.43,0.43 0,0 1,0.43 0.43Z"
+        />
+</vector>

src/android/app/src/main/res/values/strings.xml

@@ -145,6 +145,8 @@
     <string name="keys_missing_help">https://suyu-emu.org/help/quickstart/#dumping-decryption-keys</string>
 
     <!-- Applet launcher strings -->
+    <string name="qlaunch_applet">Qlaunch</string>
+    <string name="qlaunch_description">Launch applications from the system home screen</string>
     <string name="applets">Applet launcher</string>
     <string name="applets_description">Launch system applets using installed firmware</string>
     <string name="applets_error_firmware">Firmware not installed</string>

src/common/settings.h

@@ -611,7 +611,7 @@ struct Values {
                                            Category::Network};
 
     // WebService
-    Setting<std::string> web_api_url{linkage, "http://74.113.97.71:3000", "web_api_url",
+    Setting<std::string> web_api_url{linkage, "https://suyu.dev", "web_api_url",
                                      Category::WebService};
     Setting<std::string> suyu_username{linkage, std::string(), "suyu_username",
                                        Category::WebService};

src/core/arm/nce/visitor_base.h

@@ -11,6 +11,8 @@
 #include <dynarmic/frontend/A64/decoder/a64.h>
 #include <dynarmic/frontend/imm.h>
 
+#include "common/common_types.h"
+
 #pragma GCC diagnostic pop
 
 namespace Core {

src/core/crypto/key_manager.cpp

@@ -668,7 +668,7 @@ static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_
 
 void KeyManager::LoadFromFile(const std::filesystem::path& file_path, bool is_title_keys) {
     if (!Common::FS::Exists(file_path)) {
-        LOG_ERROR(Crypto, "Failed to load key file at '{}': File not found",
+        LOG_ERROR(Crypto, "Cannot handle key file '{}': File not found",
                   file_path.generic_string());
         return;
     }
@@ -803,8 +803,7 @@ bool KeyManager::BaseDeriveNecessary() const {
     }
 
     if (!Common::FS::Exists(suyu_keys_dir / "title.keys")) {
-        LOG_ERROR(Crypto, "No title.keys found");
-        return true;
+        LOG_WARNING(Crypto, "Could not locate a title.keys file");
     }
 
     if (check_key_existence(S256KeyType::Header)) {

src/core/hle/service/am/service/common_state_getter.cpp

@@ -38,7 +38,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_, std::shared_ptr<Ap
         {30, nullptr, "GetHomeButtonReaderLockAccessor"},
         {31, D<&ICommonStateGetter::GetReaderLockAccessorEx>, "GetReaderLockAccessorEx"},
         {32, D<&ICommonStateGetter::GetWriterLockAccessorEx>, "GetWriterLockAccessorEx"},
-        {40, nullptr, "GetCradleFwVersion"},
+        {40, D<&ICommonStateGetter::GetCradleFwVersion>, "GetCradleFwVersion"},
         {50, D<&ICommonStateGetter::IsVrModeEnabled>, "IsVrModeEnabled"},
         {51, D<&ICommonStateGetter::SetVrModeEnabled>, "SetVrModeEnabled"},
         {52, D<&ICommonStateGetter::SetLcdBacklighOffEnabled>, "SetLcdBacklighOffEnabled"},
@@ -159,6 +159,17 @@ Result ICommonStateGetter::GetBootMode(Out<PM::SystemBootMode> out_boot_mode) {
     R_SUCCEED();
 }
 
+Result ICommonStateGetter::GetCradleFwVersion(OutArray<uint32_t, 4> out_version) {
+    LOG_DEBUG(Service_AM, "(STUBBED) called");
+
+    out_version[0] = 0;
+    out_version[1] = 0;
+    out_version[2] = 0;
+    out_version[3] = 0;
+
+    R_SUCCEED();
+}
+
 Result ICommonStateGetter::IsVrModeEnabled(Out<bool> out_is_vr_mode_enabled) {
     LOG_DEBUG(Service_AM, "called");
 

src/core/hle/service/am/service/common_state_getter.h

@@ -38,6 +38,7 @@ private:
     Result GetOperationMode(Out<OperationMode> out_operation_mode);
     Result GetPerformanceMode(Out<APM::PerformanceMode> out_performance_mode);
     Result GetBootMode(Out<PM::SystemBootMode> out_boot_mode);
+    Result GetCradleFwVersion(OutArray<uint32_t, 4> out_version);
     Result IsVrModeEnabled(Out<bool> out_is_vr_mode_enabled);
     Result SetVrModeEnabled(bool is_vr_mode_enabled);
     Result SetLcdBacklighOffEnabled(bool is_lcd_backlight_off_enabled);

src/core/hle/service/am/service/global_state_controller.cpp

@@ -14,7 +14,7 @@ IGlobalStateController::IGlobalStateController(Core::System& system_)
     static const FunctionInfo functions[] = {
         {0, nullptr, "RequestToEnterSleep"},
         {1, nullptr, "EnterSleep"},
-        {2, nullptr, "StartSleepSequence"},
+        {2, D<&IGlobalStateController::StartSleepSequence>, "StartSleepSequence"},
         {3, D<&IGlobalStateController::StartShutdownSequence>, "StartShutdownSequence"},
         {4, D<&IGlobalStateController::StartRebootSequence>, "StartRebootSequence"},
         {9, nullptr, "IsAutoPowerDownRequested"},
@@ -31,6 +31,13 @@ IGlobalStateController::IGlobalStateController(Core::System& system_)
     RegisterHandlers(functions);
 }
 
+IGlobalStateController::~IGlobalStateController() = default;
+
+Result IGlobalStateController::StartSleepSequence(u8 a) {
+    LOG_WARNING(Service_AM, "(STUBBED) called, a={}", a);
+    R_SUCCEED();
+}
+
 Result IGlobalStateController::StartShutdownSequence() {
     LOG_INFO(Service_AM, "called");
     system.Exit();
@@ -43,8 +50,6 @@ Result IGlobalStateController::StartRebootSequence() {
     R_SUCCEED();
 }
 
-IGlobalStateController::~IGlobalStateController() = default;
-
 Result IGlobalStateController::LoadAndApplyIdlePolicySettings() {
     LOG_WARNING(Service_AM, "(STUBBED) called");
     R_SUCCEED();

src/core/hle/service/am/service/global_state_controller.h

@@ -18,6 +18,7 @@ public:
     ~IGlobalStateController() override;
 
 private:
+    Result StartSleepSequence(u8 a);
     Result StartShutdownSequence();
     Result StartRebootSequence();
     Result LoadAndApplyIdlePolicySettings();

src/core/hle/service/am/service/home_menu_functions.cpp

@@ -23,7 +23,7 @@ IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_, std::shared_ptr<Ap
         {21, D<&IHomeMenuFunctions::GetPopFromGeneralChannelEvent>, "GetPopFromGeneralChannelEvent"},
         {30, nullptr, "GetHomeButtonWriterLockAccessor"},
         {31, nullptr, "GetWriterLockAccessorEx"},
-        {40, nullptr, "IsSleepEnabled"},
+        {40, D<&IHomeMenuFunctions::IsSleepEnabled>, "IsSleepEnabled"},
         {41, D<&IHomeMenuFunctions::IsRebootEnabled>, "IsRebootEnabled"},
         {50, nullptr, "LaunchSystemApplet"},
         {51, nullptr, "LaunchStarter"},
@@ -64,9 +64,15 @@ Result IHomeMenuFunctions::GetPopFromGeneralChannelEvent(
     R_SUCCEED();
 }
 
-Result IHomeMenuFunctions::IsRebootEnabled(Out<bool> out_is_reboot_enbaled) {
+Result IHomeMenuFunctions::IsSleepEnabled(Out<bool> out_is_sleep_enabled) {
     LOG_INFO(Service_AM, "called");
-    *out_is_reboot_enbaled = true;
+    *out_is_sleep_enabled = true;
+    R_SUCCEED();
+}
+
+Result IHomeMenuFunctions::IsRebootEnabled(Out<bool> out_is_reboot_enabled) {
+    LOG_INFO(Service_AM, "called");
+    *out_is_reboot_enabled = true;
     R_SUCCEED();
 }
 

src/core/hle/service/am/service/home_menu_functions.h

@@ -24,7 +24,8 @@ private:
     Result LockForeground();
     Result UnlockForeground();
     Result GetPopFromGeneralChannelEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
-    Result IsRebootEnabled(Out<bool> out_is_reboot_enbaled);
+    Result IsSleepEnabled(Out<bool> out_is_sleep_enabled);
+    Result IsRebootEnabled(Out<bool> out_is_reboot_enabled);
     Result IsForceTerminateApplicationDisabledForDebug(
         Out<bool> out_is_force_terminate_application_disabled_for_debug);
 

src/core/hle/service/filesystem/fsp/fsp_srv.cpp

@@ -67,7 +67,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
         {24, nullptr, "RegisterSaveDataFileSystemAtomicDeletion"},
         {25, nullptr, "DeleteSaveDataFileSystemBySaveDataSpaceId"},
         {26, nullptr, "FormatSdCardDryRun"},
-        {27, nullptr, "IsExFatSupported"},
+        {27, D<&FSP_SRV::IsExFatSupported>, "IsExFatSupported"},
         {28, nullptr, "DeleteSaveDataFileSystemBySaveDataAttribute"},
         {30, nullptr, "OpenGameCardStorage"},
         {31, nullptr, "OpenGameCardFileSystem"},
@@ -235,6 +235,14 @@ Result FSP_SRV::CreateSaveDataFileSystem(FileSys::SaveDataCreationInfo save_crea
                                                   save_struct));
 }
 
+Result FSP_SRV::IsExFatSupported(Out<bool> out_is_supported) {
+    LOG_WARNING(Service_FS, "(STUBBED) called");
+
+    *out_is_supported = true;
+
+    R_SUCCEED();
+}
+
 Result FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId(
     FileSys::SaveDataAttribute save_struct, FileSys::SaveDataCreationInfo save_create_struct) {
     LOG_DEBUG(Service_FS, "called save_struct = {}", save_struct.DebugInfo());

src/core/hle/service/filesystem/fsp/fsp_srv.h

@@ -53,6 +53,7 @@ private:
     Result OpenSdCardFileSystem(OutInterface<IFileSystem> out_interface);
     Result CreateSaveDataFileSystem(FileSys::SaveDataCreationInfo save_create_struct,
                                     FileSys::SaveDataAttribute save_struct, u128 uid);
+    Result IsExFatSupported(Out<bool> out_is_supported);
     Result CreateSaveDataFileSystemBySystemSaveDataId(
         FileSys::SaveDataAttribute save_struct, FileSys::SaveDataCreationInfo save_create_struct);
     Result OpenSaveDataFileSystem(OutInterface<IFileSystem> out_interface,

src/core/hle/service/ldn/sf_monitor_service.cpp

@@ -30,10 +30,10 @@ Result ISfMonitorService::Initialize(Out<u32> out_value) {
 }
 
 Result ISfMonitorService::GetGroupInfo(
-    OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info) {
+    GroupInfo in_group_info, OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info) {
     LOG_WARNING(Service_LDN, "(STUBBED) called");
 
-    *out_group_info = GroupInfo{};
+    memcpy(out_group_info, &in_group_info, sizeof(GroupInfo));
     R_SUCCEED();
 }
 

src/core/hle/service/ldn/sf_monitor_service.h

@@ -20,7 +20,8 @@ public:
 
 private:
     Result Initialize(Out<u32> out_value);
-    Result GetGroupInfo(OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info);
+    Result GetGroupInfo(GroupInfo in_group_info,
+                        OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info);
 };
 
 } // namespace Service::LDN

src/core/hle/service/ldn/sf_service_monitor.cpp

@@ -40,10 +40,10 @@ Result ISfServiceMonitor::Initialize(Out<u32> out_value) {
 }
 
 Result ISfServiceMonitor::GetGroupInfo(
-    OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info) {
+    GroupInfo in_group_info, OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info) {
     LOG_WARNING(Service_LDN, "(STUBBED) called");
 
-    *out_group_info = GroupInfo{};
+    memcpy(out_group_info, &in_group_info, sizeof(GroupInfo));
     R_SUCCEED();
 }
 

src/core/hle/service/ldn/sf_service_monitor.h

@@ -20,7 +20,8 @@ public:
 
 private:
     Result Initialize(Out<u32> out_value);
-    Result GetGroupInfo(OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info);
+    Result GetGroupInfo(GroupInfo in_group_info,
+                        OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info);
 };
 
 } // namespace Service::LDN

src/core/hle/service/nifm/nifm.cpp

@@ -507,7 +507,7 @@ void IGeneralService::GetCurrentIpConfigInfo(HLERequestContext& ctx) {
 }
 
 void IGeneralService::IsWirelessCommunicationEnabled(HLERequestContext& ctx) {
-    LOG_WARNING(Service_NIFM, "(STUBBED) called");
+    LOG_WARNING(Service_NIFM, "called");
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);

src/core/hle/service/nvnflinger/hardware_composer.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include <optional>
 #include <boost/container/small_vector.hpp>
 
 #include "common/microprofile.h"

src/core/hle/service/set/settings_types.h

@@ -509,4 +509,13 @@ struct TvSettings {
 };
 static_assert(sizeof(TvSettings) == 0x20, "TvSettings is an invalid size");
 
+/// This is nn::settings::system::RebootlessSystemUpdateVersion
+struct RebootlessSystemUpdateVersion {
+    u32 version;
+    u8 reserved[0x1c];
+    char display_version[0x20];
+};
+static_assert(sizeof(RebootlessSystemUpdateVersion) == 0x40,
+              "RebootlessSystemUpdateVersion is an invalid size");
+
 } // namespace Service::Set

src/core/hle/service/set/system_settings_server.cpp

@@ -238,7 +238,7 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_)
         {146, nullptr, "SetConsoleSixAxisSensorAngularVelocityTimeBias"},
         {147, nullptr, "GetConsoleSixAxisSensorAngularAcceleration"},
         {148, nullptr, "SetConsoleSixAxisSensorAngularAcceleration"},
-        {149, nullptr, "GetRebootlessSystemUpdateVersion"},
+        {149, C<&ISystemSettingsServer::GetRebootlessSystemUpdateVersion>, "GetRebootlessSystemUpdateVersion"},
         {150, C<&ISystemSettingsServer::GetDeviceTimeZoneLocationUpdatedTime>, "GetDeviceTimeZoneLocationUpdatedTime"},
         {151, C<&ISystemSettingsServer::SetDeviceTimeZoneLocationUpdatedTime>, "SetDeviceTimeZoneLocationUpdatedTime"},
         {152, C<&ISystemSettingsServer::GetUserSystemClockAutomaticCorrectionUpdatedTime>, "GetUserSystemClockAutomaticCorrectionUpdatedTime"},
@@ -1194,6 +1194,16 @@ Result ISystemSettingsServer::SetKeyboardLayout(KeyboardLayout keyboard_layout)
     R_SUCCEED();
 }
 
+Result ISystemSettingsServer::GetRebootlessSystemUpdateVersion(
+    Out<RebootlessSystemUpdateVersion> out_rebootless_system_update) {
+    LOG_INFO(Service_SET, "(STUBBED) called");
+
+    out_rebootless_system_update->version = 0;
+    strcpy(out_rebootless_system_update->display_version, "0.0.0");
+
+    R_SUCCEED();
+}
+
 Result ISystemSettingsServer::GetDeviceTimeZoneLocationUpdatedTime(
     Out<Service::PSC::Time::SteadyClockTimePoint> out_time_point) {
     LOG_INFO(Service_SET, "called");

src/core/hle/service/set/system_settings_server.h

@@ -136,6 +136,8 @@ public:
     Result SetAppletLaunchFlags(u32 applet_launch_flag);
     Result GetKeyboardLayout(Out<KeyboardLayout> out_keyboard_layout);
     Result SetKeyboardLayout(KeyboardLayout keyboard_layout);
+    Result GetRebootlessSystemUpdateVersion(
+        Out<RebootlessSystemUpdateVersion> out_rebootless_system_update);
     Result GetDeviceTimeZoneLocationUpdatedTime(
         Out<Service::PSC::Time::SteadyClockTimePoint> out_time_point);
     Result SetDeviceTimeZoneLocationUpdatedTime(

src/core/loader/nax.cpp

@@ -55,10 +55,6 @@ AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::KProcess& process, Core::S
             return {ResultStatus::ErrorMissingProductionKeyFile, {}};
         }
 
-        if (!Core::Crypto::KeyManager::KeyFileExists(true)) {
-            return {ResultStatus::ErrorMissingProductionKeyFile, {}};
-        }
-
         return {ResultStatus::ErrorNAXInconvertibleToNCA, {}};
     }
 

src/core/loader/nsp.cpp

@@ -102,10 +102,6 @@ AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::KProcess& process, Core::S
             return {ResultStatus::ErrorMissingProductionKeyFile, {}};
         }
 
-        if (!Core::Crypto::KeyManager::KeyFileExists(true)) {
-            return {ResultStatus::ErrorMissingProductionKeyFile, {}};
-        }
-
         return {ResultStatus::ErrorNSPMissingProgramNCA, {}};
     }
 

src/core/loader/xci.cpp

@@ -71,10 +71,6 @@ AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::KProcess& process, Core::S
         return {ResultStatus::ErrorMissingProductionKeyFile, {}};
     }
 
-    if (!xci->HasProgramNCA() && !Core::Crypto::KeyManager::KeyFileExists(true)) {
-        return {ResultStatus::ErrorMissingProductionKeyFile, {}};
-    }
-
     const auto result = nca_loader->Load(process, system);
     if (result.first != ResultStatus::Success) {
         return result;

src/hid_core/frontend/emulated_controller.cpp

@@ -762,6 +762,8 @@ void EmulatedController::StartMotionCalibration() {
 
 void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index,
                                    Common::UUID uuid) {
+    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
+    const auto& player = Settings::values.players.GetValue()[player_index];
     if (index >= controller.button_values.size()) {
         return;
     }
@@ -917,14 +919,9 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
 
     lock.unlock();
 
-    if (!is_connected) {
-        if (npad_id_type == NpadIdType::Player1 && npad_type != NpadStyleIndex::Handheld) {
+    if (player.connected) {
         Connect();
     }
-        if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {
-            Connect();
-        }
-    }
     TriggerOnChange(ControllerTriggerType::Button, true);
 }
 

src/suyu/configuration/configure_web.cpp

@@ -63,11 +63,11 @@ void ConfigureWeb::RetranslateUI() {
     ui->retranslateUi(this);
 
     ui->web_signup_link->setText(
-        tr("<a href='https://profile.suyu.dev/'><span style=\"text-decoration: underline; "
+        tr("<a href='https://suyu.dev/signup'><span style=\"text-decoration: underline; "
            "color:#039be5;\">Sign up</span></a>"));
 
     ui->web_token_info_link->setText(
-        tr("<a href='https://suyu.dev/wiki/suyu-web-service/'><span style=\"text-decoration: "
+        tr("<a href='https://suyu.dev/account'><span style=\"text-decoration: "
            "underline; color:#039be5;\">What is my token?</span></a>"));
 }
 

src/suyu/main.cpp

@@ -1755,9 +1755,9 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
     if (!ContentManager::AreKeysPresent()) {
         QMessageBox::warning(this, tr("Derivation Components Missing"),
                              tr("Encryption keys are missing. "
-                                "You need to provide both your own title.keys "
-                                "and your own prod.keys "
-                                "in order to play games"));
+                                "In order to use this emulator"
+                                "you need to provide your own encryption keys"
+                                "in order to play them."));
         return false;
     }
 
@@ -4630,9 +4630,9 @@ void GMainWindow::OnCheckFirmwareDecryption() {
     if (!ContentManager::AreKeysPresent()) {
         QMessageBox::warning(this, tr("Derivation Components Missing"),
                              tr("Encryption keys are missing. "
-                                "You need to provide both your own title.keys "
-                                "and your own prod.keys "
-                                "in order to play games"));
+                                "In order to use this emulator"
+                                "you need to provide your own encryption keys"
+                                "in order to play them."));
     }
 
     SetFirmwareVersion();

src/video_core/CMakeLists.txt

@@ -9,7 +9,7 @@ if(LIBVA_FOUND)
     list(APPEND FFmpeg_LIBRARIES ${LIBVA_LIBRARIES})
 endif()
 
-add_library(video_core STATIC
+set(sources
     buffer_cache/buffer_base.h
     buffer_cache/buffer_cache_base.h
     buffer_cache/buffer_cache.cpp
@@ -315,6 +315,67 @@ add_library(video_core STATIC
     vulkan_common/vulkan.h
 )
 
+if (APPLE)
+    list(REMOVE_ITEM sources
+        renderer_opengl/present/filters.cpp
+        renderer_opengl/present/filters.h
+        renderer_opengl/present/fsr.cpp
+        renderer_opengl/present/fsr.h
+        renderer_opengl/present/fxaa.cpp
+        renderer_opengl/present/fxaa.h
+        renderer_opengl/present/layer.cpp
+        renderer_opengl/present/layer.h
+        renderer_opengl/present/present_uniforms.h
+        renderer_opengl/present/smaa.cpp
+        renderer_opengl/present/smaa.h
+        renderer_opengl/present/util.h
+        renderer_opengl/present/window_adapt_pass.cpp
+        renderer_opengl/present/window_adapt_pass.h
+        renderer_opengl/blit_image.cpp
+        renderer_opengl/blit_image.h
+        renderer_opengl/gl_blit_screen.cpp
+        renderer_opengl/gl_blit_screen.h
+        renderer_opengl/gl_buffer_cache_base.cpp
+        renderer_opengl/gl_buffer_cache.cpp
+        renderer_opengl/gl_buffer_cache.h
+        renderer_opengl/gl_compute_pipeline.cpp
+        renderer_opengl/gl_compute_pipeline.h
+        renderer_opengl/gl_device.cpp
+        renderer_opengl/gl_device.h
+        renderer_opengl/gl_fence_manager.cpp
+        renderer_opengl/gl_fence_manager.h
+        renderer_opengl/gl_graphics_pipeline.cpp
+        renderer_opengl/gl_graphics_pipeline.h
+        renderer_opengl/gl_rasterizer.cpp
+        renderer_opengl/gl_rasterizer.h
+        renderer_opengl/gl_resource_manager.cpp
+        renderer_opengl/gl_resource_manager.h
+        renderer_opengl/gl_shader_cache.cpp
+        renderer_opengl/gl_shader_cache.h
+        renderer_opengl/gl_shader_manager.cpp
+        renderer_opengl/gl_shader_manager.h
+        renderer_opengl/gl_shader_context.h
+        renderer_opengl/gl_shader_util.cpp
+        renderer_opengl/gl_shader_util.h
+        renderer_opengl/gl_state_tracker.cpp
+        renderer_opengl/gl_state_tracker.h
+        renderer_opengl/gl_staging_buffer_pool.cpp
+        renderer_opengl/gl_staging_buffer_pool.h
+        renderer_opengl/gl_texture_cache.cpp
+        renderer_opengl/gl_texture_cache.h
+        renderer_opengl/gl_texture_cache_base.cpp
+        renderer_opengl/gl_query_cache.cpp
+        renderer_opengl/gl_query_cache.h
+        renderer_opengl/maxwell_to_gl.h
+        renderer_opengl/renderer_opengl.cpp
+        renderer_opengl/renderer_opengl.h
+        renderer_opengl/util_shaders.cpp
+        renderer_opengl/util_shaders.h
+    )
+endif()
+
+add_library(video_core STATIC ${sources})
+
 target_link_libraries(video_core PUBLIC common core)
 target_link_libraries(video_core PUBLIC glad shader_recompiler stb bc_decoder)
 
@@ -347,7 +408,7 @@ if (MSVC)
         /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data
     )
 else()
-    if (APPLE)
+    if (APPLE OR ARCHITECTURE_arm64)
         # error: declaration shadows a typedef in 'interval_base_set<SubType, DomainT, Compare, Interval, Alloc>'
         # error: implicit conversion loses integer precision: 'int' to 'boost::icl::bound_type' (aka 'unsigned char')
         target_compile_options(video_core PRIVATE -Wno-shadow -Wno-unused-local-typedef)

src/video_core/video_core.cpp

@@ -21,9 +21,15 @@ std::unique_ptr<VideoCore::RendererBase> CreateRenderer(
     auto& device_memory = system.Host1x().MemoryManager();
 
     switch (Settings::values.renderer_backend.GetValue()) {
+#ifdef __APPLE__
+        // do nothing for now, include metal in here at later date.
+#else
+        // openGL, not supported on Apple so not bothering to include if macos
     case Settings::RendererBackend::OpenGL:
         return std::make_unique<OpenGL::RendererOpenGL>(emu_window, device_memory, gpu,
                                                         std::move(context));
+#endif
+        // common renderers
     case Settings::RendererBackend::Vulkan:
         return std::make_unique<Vulkan::RendererVulkan>(emu_window, device_memory, gpu,
                                                         std::move(context));

src/video_core/vulkan_common/vulkan.h

@@ -15,7 +15,11 @@
 #define VK_USE_PLATFORM_WAYLAND_KHR
 #endif
 
+#ifdef __APPLE__
+#include <MoltenVK/mvk_vulkan.h>
+#else
 #include <vulkan/vulkan.h>
+#endif
 
 // Sanitize macros
 #undef CreateEvent

src/video_core/vulkan_common/vulkan_device.cpp

@@ -1364,6 +1364,7 @@ void Device::CollectToolingInfo() {
         LOG_INFO(Render_Vulkan, "Attached debugging tool: {}", name);
         has_renderdoc = has_renderdoc || name == "RenderDoc";
         has_nsight_graphics = has_nsight_graphics || name == "NVIDIA Nsight Graphics";
+        has_radeon_gpu_profiler = has_radeon_gpu_profiler || name == "Radeon GPU Profiler";
     }
 }
 

src/video_core/vulkan_common/vulkan_device.h

@@ -592,7 +592,7 @@ public:
 
     /// Returns true when a known debugging tool is attached.
     bool HasDebuggingToolAttached() const {
-        return has_renderdoc || has_nsight_graphics;
+        return has_renderdoc || has_nsight_graphics || has_radeon_gpu_profiler;
     }
 
     /// @returns True if compute pipelines can cause crashing.
@@ -821,6 +821,7 @@ private:
     bool has_broken_parallel_compiling{};      ///< Has broken parallel shader compiling.
     bool has_renderdoc{};                      ///< Has RenderDoc attached
     bool has_nsight_graphics{};                ///< Has Nsight Graphics attached
+    bool has_radeon_gpu_profiler{};            ///< Has Radeon GPU Profiler attached.
     bool supports_d24_depth{};                 ///< Supports D24 depth buffers.
     bool cant_blit_msaa{};                     ///< Does not support MSAA<->MSAA blitting.
     bool must_emulate_scaled_formats{};        ///< Requires scaled vertex format emulation