Revert "[GPU] Change GOB processing with inline upload/download functions"

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/common/dynamic_library.cpp

@@ -5,7 +5,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <string>
+
+#ifndef _WIN32
 #include <cstring>
+#endif
+
 #include <utility>
 
 #include <fmt/ranges.h>

src/common/uuid.cpp

@@ -208,12 +208,4 @@ UUID UUID::MakeRandomRFC4122V4() {
     return uuid;
 }
 
-UUID UUID::MakeRFC4122V5(std::span<u8, 20> sha1) {
-    UUID uuid{};
-    std::memcpy(&uuid.uuid, sha1.data(), sizeof(UUID));
-    uuid.uuid[8] = 0x80 | (uuid.uuid[8] & 0x3F);
-    uuid.uuid[6] = 0x50 | (uuid.uuid[6] & 0xF);
-    return uuid;
-}
-
 } // namespace Common

src/common/uuid.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -8,7 +5,6 @@
 
 #include <array>
 #include <functional>
-#include <span>
 #include <string>
 
 #include "common/common_types.h"
@@ -90,20 +86,28 @@ struct UUID {
         };
     }
 
-    /// @brief Creates a random UUID.
-    /// @returns A random UUID.
-    [[nodiscard]] static UUID MakeRandom();
+    /**
+     * Creates a random UUID.
+     *
+     * @returns A random UUID.
+     */
+    static UUID MakeRandom();
 
-    /// @brief Creates a random UUID with a seed.
-    /// @param seed A seed to initialize the Mersenne-Twister RNG
-    /// @returns A random UUID.
-    [[nodiscard]] static UUID MakeRandomWithSeed(u32 seed);
+    /**
+     * Creates a random UUID with a seed.
+     *
+     * @param seed A seed to initialize the Mersenne-Twister RNG
+     *
+     * @returns A random UUID.
+     */
+    static UUID MakeRandomWithSeed(u32 seed);
 
-    /// @brief Creates a random UUID. The generated UUID is RFC 4122 Version 4 compliant.
-    /// @returns A random UUID that is RFC 4122 Version 4 compliant.
-    [[nodiscard]] static UUID MakeRandomRFC4122V4();
-
-    [[nodiscard]] static UUID MakeRFC4122V5(std::span<u8, 20> sha1);
+    /**
+     * Creates a random UUID. The generated UUID is RFC 4122 Version 4 compliant.
+     *
+     * @returns A random UUID that is RFC 4122 Version 4 compliant.
+     */
+    static UUID MakeRandomRFC4122V4();
 
     friend constexpr bool operator==(const UUID& lhs, const UUID& rhs) = default;
 };

src/core/arm/nce/arm_nce.cpp

@@ -162,8 +162,7 @@ bool ArmNce::HandleGuestAccessFault(GuestContext* guest_ctx, void* raw_info, voi
 
     // Try to handle an invalid access.
     // TODO: handle accesses which split a page?
-    const Common::ProcessAddress addr =
-        (reinterpret_cast<u64>(info->si_addr) & ~Memory::YUZU_PAGEMASK);
+    const Common::ProcessAddress addr = u64(info->si_addr) & ~Memory::YUZU_PAGEMASK;
     auto& memory = guest_ctx->parent->m_running_thread->GetOwnerProcess()->GetMemory();
     if (memory.InvalidateNCE(addr, Memory::YUZU_PAGESIZE)) {
         // We handled the access successfully and are returning to guest code.

src/core/file_sys/control_metadata.h

@@ -274,22 +274,23 @@ public:
     explicit NACP(VirtualFile file);
     ~NACP();
 
-    [[nodiscard]] const LanguageEntry& GetLanguageEntry() const;
-    [[nodiscard]] std::string GetApplicationName() const;
-    [[nodiscard]] std::string GetDeveloperName() const;
-    [[nodiscard]] u64 GetTitleId() const;
-    [[nodiscard]] u64 GetDLCBaseTitleId() const;
-    [[nodiscard]] std::string GetVersionString() const;
-    [[nodiscard]] u64 GetDefaultNormalSaveSize() const;
-    [[nodiscard]] u64 GetDefaultJournalSaveSize() const;
-    [[nodiscard]] u32 GetSupportedLanguages() const;
-    [[nodiscard]] std::vector<std::string> GetApplicationNames() const;
-    [[nodiscard]] std::vector<u8> GetRawBytes() const;
-    [[nodiscard]] bool GetUserAccountSwitchLock() const;
-    [[nodiscard]] u64 GetDeviceSaveDataSize() const;
-    [[nodiscard]] u32 GetParentalControlFlag() const;
-    [[nodiscard]] const std::array<u8, 0x20>& GetRatingAge() const;
+    const LanguageEntry& GetLanguageEntry() const;
+    std::string GetApplicationName() const;
+    std::string GetDeveloperName() const;
+    u64 GetTitleId() const;
+    u64 GetDLCBaseTitleId() const;
+    std::string GetVersionString() const;
+    u64 GetDefaultNormalSaveSize() const;
+    u64 GetDefaultJournalSaveSize() const;
+    u32 GetSupportedLanguages() const;
+    std::vector<std::string> GetApplicationNames() const;
+    std::vector<u8> GetRawBytes() const;
+    bool GetUserAccountSwitchLock() const;
+    u64 GetDeviceSaveDataSize() const;
+    u32 GetParentalControlFlag() const;
+    const std::array<u8, 0x20>& GetRatingAge() const;
 
+private:
     RawNACP raw{};
     std::vector<LanguageEntry> language_entries;
 };

src/core/file_sys/patch_manager.cpp

@@ -1156,14 +1156,4 @@ PatchManager::Metadata PatchManager::ParseControlNCA(const NCA& nca) const {
 
     return {std::move(nacp), icon_file};
 }
-
-[[nodiscard]] PatchManager::Metadata PatchManager::GetMetadataFromBaseOrUpdate(Core::System& system, u64 application_id) noexcept {
-    const FileSys::PatchManager pm{application_id, system.GetFileSystemController(), system.GetContentProvider()};
-    auto metadata = pm.GetControlMetadata();
-    if (metadata.first != nullptr)
-        return metadata;
-    const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(application_id), system.GetFileSystemController(), system.GetContentProvider()};
-    return pm_update.GetControlMetadata();
-}
-
 } // namespace FileSys

src/core/file_sys/patch_manager.h

@@ -105,9 +105,6 @@ public:
     // Version of GetControlMetadata that takes an arbitrary NCA
     [[nodiscard]] Metadata ParseControlNCA(const NCA& nca) const;
 
-    /// @brief Gets NACP metadata (accounting for any patches or updates)
-    [[nodiscard]] static PatchManager::Metadata GetMetadataFromBaseOrUpdate(Core::System& system, u64 application_id) noexcept;
-
 private:
     [[nodiscard]] std::vector<VirtualFile> CollectPatches(const std::vector<VirtualDir>& patch_dirs,
                                                           const std::string& build_id) const;

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

@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <openssl/evp.h>
-
 #include "common/settings.h"
 #include "common/uuid.h"
 #include "core/file_sys/control_metadata.h"
@@ -156,7 +154,20 @@ Result IApplicationFunctions::GetDesiredLanguage(Out<u64> out_language_code) {
     // Default to 0 (all languages supported)
     u32 supported_languages = 0;
 
-    const auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, m_applet->program_id);
+    const auto res = [this] {
+        const FileSys::PatchManager pm{m_applet->program_id, system.GetFileSystemController(),
+                                       system.GetContentProvider()};
+        auto metadata = pm.GetControlMetadata();
+        if (metadata.first != nullptr) {
+            return metadata;
+        }
+
+        const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(m_applet->program_id),
+                                              system.GetFileSystemController(),
+                                              system.GetContentProvider()};
+        return pm_update.GetControlMetadata();
+    }();
+
     if (res.first != nullptr) {
         supported_languages = res.first->GetSupportedLanguages();
     }
@@ -194,7 +205,20 @@ Result IApplicationFunctions::SetTerminateResult(Result terminate_result) {
 Result IApplicationFunctions::GetDisplayVersion(Out<DisplayVersion> out_display_version) {
     LOG_DEBUG(Service_AM, "called");
 
-    const auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, m_applet->program_id);
+    const auto res = [this] {
+        const FileSys::PatchManager pm{m_applet->program_id, system.GetFileSystemController(),
+                                       system.GetContentProvider()};
+        auto metadata = pm.GetControlMetadata();
+        if (metadata.first != nullptr) {
+            return metadata;
+        }
+
+        const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(m_applet->program_id),
+                                              system.GetFileSystemController(),
+                                              system.GetContentProvider()};
+        return pm_update.GetControlMetadata();
+    }();
+
     if (res.first != nullptr) {
         const auto& version = res.first->GetVersionString();
         std::memcpy(out_display_version->string.data(), version.data(),
@@ -323,21 +347,8 @@ Result IApplicationFunctions::NotifyRunning(Out<bool> out_became_running) {
 }
 
 Result IApplicationFunctions::GetPseudoDeviceId(Out<Common::UUID> out_pseudo_device_id) {
-    LOG_WARNING(Service_AM, "(stubbed)");
-
-    // This should be hashed with the device specific hash
-    // for now this will do
-    const auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, m_applet->program_id);
-    u8 hash[EVP_MAX_MD_SIZE];
-    unsigned int hash_len = 0;
-    auto const seed = res.first->raw.seed_for_pseudo_device_id;
-    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-    auto const algorithm = EVP_sha1();
-    EVP_DigestInit_ex(ctx, algorithm, nullptr);
-    EVP_DigestUpdate(ctx, &seed, sizeof(seed));
-    EVP_DigestFinal_ex(ctx, hash, &hash_len);
-    EVP_MD_CTX_free(ctx);
-    *out_pseudo_device_id = Common::UUID::MakeRFC4122V5(std::span<u8, 20>{hash, std::size(hash)});
+    LOG_WARNING(Service_AM, "(STUBBED) called");
+    *out_pseudo_device_id = {};
     R_SUCCEED();
 }
 

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

@@ -252,7 +252,19 @@ Result ILibraryAppletSelfAccessor::GetMainAppletApplicationDesiredLanguage(
     // Default to 0 (all languages supported)
     u32 supported_languages = 0;
 
-    const auto res = FileSys::PatchManager::GetMetadataFromBaseOrUpdate(system, identity.application_id);
+    const auto res = [this, identity] {
+        const FileSys::PatchManager pm{identity.application_id, system.GetFileSystemController(),
+                                       system.GetContentProvider()};
+        auto metadata = pm.GetControlMetadata();
+        if (metadata.first != nullptr) {
+            return metadata;
+        }
+
+        const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(identity.application_id),
+                                              system.GetFileSystemController(),
+                                              system.GetContentProvider()};
+        return pm_update.GetControlMetadata();
+    }();
 
     if (res.first != nullptr) {
         supported_languages = res.first->GetSupportedLanguages();

src/core/memory.cpp

@@ -737,10 +737,9 @@ struct Memory::Impl {
         PAddr last_address;
     };
 
-    void InvalidateGPUMemory(u8* p, size_t size) {
+    void InvalidateGPUMemory(u8* p, size_t size, bool flush) {
         constexpr size_t sys_core = Core::Hardware::NUM_CPU_CORES - 1;
-        const size_t core = (std::min)(system.GetCurrentHostThreadID(),
-                                     sys_core); // any other calls threads go to syscore.
+        const size_t core = (std::min)(system.GetCurrentHostThreadID(), sys_core); // any other calls threads go to syscore.
         if (!gpu_device_memory) [[unlikely]] {
             gpu_device_memory = &system.Host1x().MemoryManager();
         }
@@ -754,8 +753,12 @@ struct Memory::Impl {
             }
         };
         auto& gpu = system.GPU();
-        gpu_device_memory->ApplyOpOnPointer(
-            p, scratch_buffers[core], [&](DAddr address) { gpu.InvalidateRegion(address, size); });
+        gpu_device_memory->ApplyOpOnPointer(p, scratch_buffers[core], [&](DAddr addr) {
+            if (flush) {
+                void(gpu.OnCPURead(addr, size));
+            }
+            gpu.InvalidateRegion(addr, size);
+        });
     }
 
     Core::System& system;
@@ -959,27 +962,22 @@ void Memory::MarkRegionDebug(Common::ProcessAddress vaddr, u64 size, bool debug)
 }
 
 bool Memory::InvalidateNCE(Common::ProcessAddress vaddr, size_t size) {
-    [[maybe_unused]] bool mapped = true;
-    [[maybe_unused]] bool rasterizer = false;
-
-    u8* const ptr = impl->GetPointerImpl(
-        GetInteger(vaddr),
-        [&] {
-            LOG_ERROR(HW_Memory, "Unmapped InvalidateNCE for {} bytes @ {:#x}", size,
-                      GetInteger(vaddr));
-            mapped = false;
-        },
-        [&] { rasterizer = true; });
+    bool mapped = true;
+    bool rasterizer = false;
+    u8* const ptr = impl->GetPointerImpl(GetInteger(vaddr), [&] {
+        LOG_ERROR(HW_Memory, "Unmapped InvalidateNCE for {} bytes @ {:#x}", size, GetInteger(vaddr));
+        mapped = false;
+    }, [&] {
+        rasterizer = true;
+    });
     if (rasterizer) {
-        impl->InvalidateGPUMemory(ptr, size);
+        impl->InvalidateGPUMemory(ptr, size, true);
     }
-
 #ifdef __ANDROID__
     if (!rasterizer && mapped) {
         impl->host_buffer->DeferredMapSeparateHeap(GetInteger(vaddr));
     }
 #endif
-
     return mapped && ptr != nullptr;
 }
 

src/video_core/gpu.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project