Merge branch 'dev' into ddutchie/citest

This reverts commit 4009a72299.

.ci/scripts/linux/docker.sh

@@ -12,8 +12,6 @@ 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 \
@@ -26,7 +24,6 @@ cmake .. \
       -DSUYU_USE_BUNDLED_FFMPEG=ON \
       -DSUYU_ENABLE_LTO=ON \
       -DSUYU_CRASH_DUMPS=ON \
-      -DSUYU_USE_FASTER_LD=ON \
       -GNinja
 
 ninja

.gitignore

@@ -14,7 +14,6 @@ dist/english_plurals/generated_en.ts
 .idea/
 .vs/
 .vscode/
-.cache/
 CMakeLists.txt.user*
 
 # *nix related

.gitlab-ci.yml

@@ -1,22 +1,6 @@
 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 
-  # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
-  FF_USE_FASTZIP: true
-  
-  # Our Variables
-  CACHE_DIR: "$CI_PROJECT_DIR/ccache"
-  CCACHE_DIR: $CACHE_DIR
-
-
 #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES
 clang-format:
   stage: format
@@ -38,14 +22,6 @@ 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

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/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/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

@@ -408,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/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