diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2024-01-28 21:02:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-28 21:02:28 +0100 |
| commit | 3655115105b2f9f0d27e566cf069fffbe22747db (patch) | |
| tree | c1d1f99c626c4d224a4900a245d4fa555fb4fa26 /src/core | |
| parent | Merge pull request #12831 from Kelebek1/audren_multi (diff) | |
| parent | atomic_ops: Fix MSVC (diff) | |
| download | yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar.gz yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar.bz2 yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar.lz yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar.xz yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.tar.zst yuzu-3655115105b2f9f0d27e566cf069fffbe22747db.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/memory.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 1c218566f..e10a4601e 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -781,8 +781,7 @@ struct Memory::Impl { }, [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); }); if (ptr) { - const auto volatile_pointer = reinterpret_cast<volatile T*>(ptr); - return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); + return Common::AtomicCompareAndSwap(reinterpret_cast<T*>(ptr), data, expected); } return true; } @@ -796,8 +795,7 @@ struct Memory::Impl { }, [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); }); if (ptr) { - const auto volatile_pointer = reinterpret_cast<volatile u64*>(ptr); - return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); + return Common::AtomicCompareAndSwap(reinterpret_cast<u64*>(ptr), data, expected); } return true; } |