Browse Source

Partial revert "[common] remove HeapTracker (#3001)"

pull/3107/head
lizzie 1 month ago
parent
commit
bed4104a8c
  1. 8
      src/core/memory.cpp

8
src/core/memory.cpp

@ -60,7 +60,7 @@ struct Memory::Impl {
current_page_table->fastmem_arena = nullptr; current_page_table->fastmem_arena = nullptr;
} }
#ifdef __linux__
#ifdef __ANDROID__
heap_tracker.emplace(system.DeviceMemory().buffer); heap_tracker.emplace(system.DeviceMemory().buffer);
buffer = std::addressof(*heap_tracker); buffer = std::addressof(*heap_tracker);
#else #else
@ -1025,7 +1025,7 @@ struct Memory::Impl {
std::mutex sys_core_guard; std::mutex sys_core_guard;
std::optional<Common::HeapTracker> heap_tracker; std::optional<Common::HeapTracker> heap_tracker;
#ifdef __linux__
#ifdef __ANDROID__
Common::HeapTracker* buffer{}; Common::HeapTracker* buffer{};
#else #else
Common::HostMemory* buffer{}; Common::HostMemory* buffer{};
@ -1231,7 +1231,7 @@ bool Memory::InvalidateNCE(Common::ProcessAddress vaddr, size_t size) {
impl->InvalidateGPUMemory(ptr, size); impl->InvalidateGPUMemory(ptr, size);
} }
#ifdef __linux__
#ifdef __ANDROID__
if (!rasterizer && mapped) { if (!rasterizer && mapped) {
impl->buffer->DeferredMapSeparateHeap(GetInteger(vaddr)); impl->buffer->DeferredMapSeparateHeap(GetInteger(vaddr));
} }
@ -1241,7 +1241,7 @@ bool Memory::InvalidateNCE(Common::ProcessAddress vaddr, size_t size) {
} }
bool Memory::InvalidateSeparateHeap(void* fault_address) { bool Memory::InvalidateSeparateHeap(void* fault_address) {
#ifdef __linux__
#ifdef __ANDROID__
return impl->buffer->DeferredMapSeparateHeap(static_cast<u8*>(fault_address)); return impl->buffer->DeferredMapSeparateHeap(static_cast<u8*>(fault_address));
#else #else
return false; return false;

Loading…
Cancel
Save