From e715925d5279b5bc451bb398dcc4afaeaf296877 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Tue, 10 Mar 2026 03:13:21 -0400 Subject: [PATCH] Revert "[nce] Added rasterizer caching checks to memory management" --- src/core/memory.cpp | 13 ------------- src/core/memory.h | 4 +--- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/core/memory.cpp b/src/core/memory.cpp index f7031d88b5..0ad360c3df 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -639,15 +639,6 @@ struct Memory::Impl { GetInteger(vaddr), []() {}, []() {}); } - [[nodiscard]] bool IsRasterizerCached(const Common::ProcessAddress vaddr) const { - const u64 addr = GetInteger(vaddr) & 0xffffffffffffULL; - if (!AddressSpaceContains(*current_page_table, addr, 1)) { - return false; - } - return current_page_table->entries[addr >> YUZU_PAGEBITS].ptr.Type() == - Common::PageType::RasterizerCachedMemory; - } - /// @brief Reads a particular data type out of memory at the given virtual address. /// @param vaddr The virtual address to read the data type from. /// @tparam T The data type to read out of memory. @@ -1045,10 +1036,6 @@ void Memory::RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, impl->RasterizerMarkRegionCached(GetInteger(vaddr), size, cached); } -bool Memory::IsRasterizerCached(Common::ProcessAddress vaddr) const { - return impl->IsRasterizerCached(vaddr); -} - void Memory::MarkRegionDebug(Common::ProcessAddress vaddr, u64 size, bool debug) { impl->MarkRegionDebug(GetInteger(vaddr), size, debug); } diff --git a/src/core/memory.h b/src/core/memory.h index dcf8ea9656..7167efbb84 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2014 Citra Emulator Project @@ -493,8 +493,6 @@ public: void SetGPUDirtyManagers(std::span managers); - [[nodiscard]] bool IsRasterizerCached(Common::ProcessAddress vaddr) const; - bool InvalidateNCE(Common::ProcessAddress vaddr, size_t size); bool InvalidateSeparateHeap(void* fault_address);