From f6b9acccfc66794cfc718355e777aa34914e881c Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Tue, 17 May 2022 22:29:05 -0700 Subject: Common: Refactor PointerWrap --- Source/Core/UICommon/GameFileCache.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Core/UICommon/GameFileCache.cpp') diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp index a41c07553c..4b04142dd8 100644 --- a/Source/Core/UICommon/GameFileCache.cpp +++ b/Source/Core/UICommon/GameFileCache.cpp @@ -230,14 +230,14 @@ bool GameFileCache::SyncCacheFile(bool save) { // Measure the size of the buffer. u8* ptr = nullptr; - PointerWrap p_measure(&ptr, 0, PointerWrap::MODE_MEASURE); + PointerWrap p_measure(&ptr, 0, PointerWrap::Mode::MODE_MEASURE); DoState(&p_measure); const size_t buffer_size = reinterpret_cast(ptr); // Then actually do the write. std::vector buffer(buffer_size); ptr = buffer.data(); - PointerWrap p(&ptr, buffer_size, PointerWrap::MODE_WRITE); + PointerWrap p(&ptr, buffer_size, PointerWrap::Mode::MODE_WRITE); DoState(&p, buffer_size); if (f.WriteBytes(buffer.data(), buffer.size())) success = true; @@ -248,9 +248,9 @@ bool GameFileCache::SyncCacheFile(bool save) if (!buffer.empty() && f.ReadBytes(buffer.data(), buffer.size())) { u8* ptr = buffer.data(); - PointerWrap p(&ptr, buffer.size(), PointerWrap::MODE_READ); + PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::MODE_READ); DoState(&p, buffer.size()); - if (p.GetMode() == PointerWrap::MODE_READ) + if (p.IsReadMode()) success = true; } } @@ -271,16 +271,16 @@ void GameFileCache::DoState(PointerWrap* p, u64 size) u64 expected_size; } header = {CACHE_REVISION, size}; p->Do(header); - if (p->GetMode() == PointerWrap::MODE_READ) + if (p->IsReadMode()) { if (header.revision != CACHE_REVISION || header.expected_size != size) { - p->SetMode(PointerWrap::MODE_MEASURE); + p->SetMeasureMode(); return; } } p->DoEachElement(m_cached_files, [](PointerWrap& state, std::shared_ptr& elem) { - if (state.GetMode() == PointerWrap::MODE_READ) + if (state.IsReadMode()) elem = std::make_shared(); elem->DoState(state); }); -- cgit v1.2.3 From c8e20c569b7deae97b411a6eea5c846f342bbf17 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sat, 21 May 2022 21:18:27 -0700 Subject: Convert PointerWrap::Mode to enum class --- Source/Core/UICommon/GameFileCache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/UICommon/GameFileCache.cpp') diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp index 4b04142dd8..dbb349dad9 100644 --- a/Source/Core/UICommon/GameFileCache.cpp +++ b/Source/Core/UICommon/GameFileCache.cpp @@ -230,14 +230,14 @@ bool GameFileCache::SyncCacheFile(bool save) { // Measure the size of the buffer. u8* ptr = nullptr; - PointerWrap p_measure(&ptr, 0, PointerWrap::Mode::MODE_MEASURE); + PointerWrap p_measure(&ptr, 0, PointerWrap::Mode::Measure); DoState(&p_measure); const size_t buffer_size = reinterpret_cast(ptr); // Then actually do the write. std::vector buffer(buffer_size); ptr = buffer.data(); - PointerWrap p(&ptr, buffer_size, PointerWrap::Mode::MODE_WRITE); + PointerWrap p(&ptr, buffer_size, PointerWrap::Mode::Write); DoState(&p, buffer_size); if (f.WriteBytes(buffer.data(), buffer.size())) success = true; @@ -248,7 +248,7 @@ bool GameFileCache::SyncCacheFile(bool save) if (!buffer.empty() && f.ReadBytes(buffer.data(), buffer.size())) { u8* ptr = buffer.data(); - PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::MODE_READ); + PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::Read); DoState(&p, buffer.size()); if (p.IsReadMode()) success = true; -- cgit v1.2.3