Browse Source

Revert "[nce] Added rasterizer caching checks to memory management"

vkexperiments1
CamilleLaVey 4 days ago
parent
commit
e715925d52
  1. 13
      src/core/memory.cpp
  2. 4
      src/core/memory.h

13
src/core/memory.cpp

@ -639,15 +639,6 @@ struct Memory::Impl {
GetInteger(vaddr), []() {}, []() {}); 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. /// @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. /// @param vaddr The virtual address to read the data type from.
/// @tparam T The data type to read out of memory. /// @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); 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) { void Memory::MarkRegionDebug(Common::ProcessAddress vaddr, u64 size, bool debug) {
impl->MarkRegionDebug(GetInteger(vaddr), size, debug); impl->MarkRegionDebug(GetInteger(vaddr), size, debug);
} }

4
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-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-FileCopyrightText: 2014 Citra Emulator Project
@ -493,8 +493,6 @@ public:
void SetGPUDirtyManagers(std::span<Core::GPUDirtyMemoryManager> managers); void SetGPUDirtyManagers(std::span<Core::GPUDirtyMemoryManager> managers);
[[nodiscard]] bool IsRasterizerCached(Common::ProcessAddress vaddr) const;
bool InvalidateNCE(Common::ProcessAddress vaddr, size_t size); bool InvalidateNCE(Common::ProcessAddress vaddr, size_t size);
bool InvalidateSeparateHeap(void* fault_address); bool InvalidateSeparateHeap(void* fault_address);

Loading…
Cancel
Save