summaryrefslogtreecommitdiff
path: root/src/core/tools/freezer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-07-27 19:29:22 -0700
committerGravatar GitHub2020-07-27 19:29:22 -0700
commit05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch)
tree12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/tools/freezer.cpp
parentMerge pull request #4420 from lat9nq/fix-themed-label-bg (diff)
parentcore_timing: Make use of uintptr_t to represent user_data (diff)
downloadyuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.gz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.xz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.zip
Merge pull request #4437 from lioncash/ptr
core_timing: Make use of uintptr_t to represent user_data
Diffstat (limited to 'src/core/tools/freezer.cpp')
-rw-r--r--src/core/tools/freezer.cpp11
1 files changed, 6 insertions, 5 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
55 55
56Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_) 56Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_)
57 : core_timing{core_timing_}, memory{memory_} { 57 : core_timing{core_timing_}, memory{memory_} {
58 event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback", 58 event = Core::Timing::CreateEvent(
59 [this](u64 userdata, std::chrono::nanoseconds ns_late) { 59 "MemoryFreezer::FrameCallback",
60 FrameCallback(userdata, ns_late); 60 [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
61 }); 61 FrameCallback(user_data, ns_late);
62 });
62 core_timing.ScheduleEvent(memory_freezer_ns, event); 63 core_timing.ScheduleEvent(memory_freezer_ns, event);
63} 64}
64 65
@@ -159,7 +160,7 @@ std::vector<Freezer::Entry> Freezer::GetEntries() const {
159 return entries; 160 return entries;
160} 161}
161 162
162void Freezer::FrameCallback(u64, std::chrono::nanoseconds ns_late) { 163void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) {
163 if (!IsActive()) { 164 if (!IsActive()) {
164 LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); 165 LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events.");
165 return; 166 return;