diff options
author | Lioncash <mathew1800@gmail.com> | 2020-07-28 01:00:41 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-07-28 03:21:01 +0200 |
commit | a7af349daee85237384dba07533c9a407cf15592 (patch) | |
tree | e337a6e823960cc6b2a7d05c7e33e80cc51a4581 /src/core/tools | |
parent | Merge pull request #4419 from lioncash/initializer (diff) | |
download | yuzu-a7af349daee85237384dba07533c9a407cf15592.tar yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.gz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.bz2 yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.lz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.xz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.zst yuzu-a7af349daee85237384dba07533c9a407cf15592.zip |
Diffstat (limited to 'src/core/tools')
-rw-r--r-- | src/core/tools/freezer.cpp | 11 | ||||
-rw-r--r-- | src/core/tools/freezer.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 27b894b51..2003e096f 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -55,10 +55,11 @@ void MemoryWriteWidth(Core::Memory::Memory& memory, u32 width, VAddr addr, u64 v Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_) : core_timing{core_timing_}, memory{memory_} { - event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback", - [this](u64 userdata, std::chrono::nanoseconds ns_late) { - FrameCallback(userdata, ns_late); - }); + event = Core::Timing::CreateEvent( + "MemoryFreezer::FrameCallback", + [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) { + FrameCallback(user_data, ns_late); + }); core_timing.ScheduleEvent(memory_freezer_ns, event); } @@ -159,7 +160,7 @@ std::vector<Freezer::Entry> Freezer::GetEntries() const { return entries; } -void Freezer::FrameCallback(u64, std::chrono::nanoseconds ns_late) { +void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { if (!IsActive()) { LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); return; diff --git a/src/core/tools/freezer.h b/src/core/tools/freezer.h index 8438783d5..2b2326bc4 100644 --- a/src/core/tools/freezer.h +++ b/src/core/tools/freezer.h @@ -73,7 +73,7 @@ public: std::vector<Entry> GetEntries() const; private: - void FrameCallback(u64 userdata, std::chrono::nanoseconds ns_late); + void FrameCallback(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); void FillEntryReads(); std::atomic_bool active{false}; |