diff options
| author | 2024-02-19 10:50:45 -0500 | |
|---|---|---|
| committer | 2024-02-19 10:50:45 -0500 | |
| commit | c9ef2e26ca82cacc44998727d704f4b77ee88591 (patch) | |
| tree | 43a5699123e4930560fc5016faac7efb15b63f4e /src/core/memory.cpp | |
| parent | Merge pull request #13006 from liamwhite/a-hat-in-vram (diff) | |
| parent | scope_exit: Make constexpr (diff) | |
| download | yuzu-c9ef2e26ca82cacc44998727d704f4b77ee88591.tar.gz yuzu-c9ef2e26ca82cacc44998727d704f4b77ee88591.tar.xz yuzu-c9ef2e26ca82cacc44998727d704f4b77ee88591.zip | |
Merge pull request #13080 from FearlessTobi/scope-exit
scope_exit: Make constexpr
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index e10a4601e..8775369a4 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -831,11 +831,11 @@ struct Memory::Impl { | |||
| 831 | if (core == sys_core) [[unlikely]] { | 831 | if (core == sys_core) [[unlikely]] { |
| 832 | sys_core_guard.lock(); | 832 | sys_core_guard.lock(); |
| 833 | } | 833 | } |
| 834 | SCOPE_EXIT({ | 834 | SCOPE_EXIT { |
| 835 | if (core == sys_core) [[unlikely]] { | 835 | if (core == sys_core) [[unlikely]] { |
| 836 | sys_core_guard.unlock(); | 836 | sys_core_guard.unlock(); |
| 837 | } | 837 | } |
| 838 | }); | 838 | }; |
| 839 | gpu_device_memory->ApplyOpOnPointer(p, scratch_buffers[core], [&](DAddr address) { | 839 | gpu_device_memory->ApplyOpOnPointer(p, scratch_buffers[core], [&](DAddr address) { |
| 840 | auto& current_area = rasterizer_write_areas[core]; | 840 | auto& current_area = rasterizer_write_areas[core]; |
| 841 | PAddr subaddress = address >> YUZU_PAGEBITS; | 841 | PAddr subaddress = address >> YUZU_PAGEBITS; |
| @@ -866,11 +866,11 @@ struct Memory::Impl { | |||
| 866 | if (core == sys_core) [[unlikely]] { | 866 | if (core == sys_core) [[unlikely]] { |
| 867 | sys_core_guard.lock(); | 867 | sys_core_guard.lock(); |
| 868 | } | 868 | } |
| 869 | SCOPE_EXIT({ | 869 | SCOPE_EXIT { |
| 870 | if (core == sys_core) [[unlikely]] { | 870 | if (core == sys_core) [[unlikely]] { |
| 871 | sys_core_guard.unlock(); | 871 | sys_core_guard.unlock(); |
| 872 | } | 872 | } |
| 873 | }); | 873 | }; |
| 874 | auto& gpu = system.GPU(); | 874 | auto& gpu = system.GPU(); |
| 875 | gpu_device_memory->ApplyOpOnPointer( | 875 | gpu_device_memory->ApplyOpOnPointer( |
| 876 | p, scratch_buffers[core], [&](DAddr address) { gpu.InvalidateRegion(address, size); }); | 876 | p, scratch_buffers[core], [&](DAddr address) { gpu.InvalidateRegion(address, size); }); |