aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <[email protected]>2023-05-04 03:16:57 +0200
committerFernando Sahmkow <[email protected]>2023-05-07 23:46:12 +0200
commit6f90dff2938b5bd5e9311e924e8a29945f16ac18 (patch)
tree60d757ecc85615cf846b20a8d392261645a997ab /src/core/memory.cpp
parentab0c0a469c29900314847520f30d6edb914fa028 (diff)
downloadyuzu-android-6f90dff2938b5bd5e9311e924e8a29945f16ac18.tar.gz
yuzu-android-6f90dff2938b5bd5e9311e924e8a29945f16ac18.zip
Address feedback, add CR notice, etc
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 549b64ac4..514ba0d66 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -20,7 +20,6 @@
#include "video_core/gpu.h"
#include "video_core/rasterizer_download_area.h"
-
namespace Core::Memory {
// Implementation class used to keep the specifics of the memory subsystem hidden
@@ -465,7 +464,8 @@ struct Memory::Impl {
}
if (Settings::IsFastmemEnabled()) {
- const bool is_read_enable = !Settings::values.use_reactive_flushing.GetValue() || !cached;
+ const bool is_read_enable =
+ !Settings::values.use_reactive_flushing.GetValue() || !cached;
system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached);
}
@@ -654,9 +654,7 @@ struct Memory::Impl {
LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8,
GetInteger(vaddr));
},
- [&]() {
- HandleRasterizerDownload(GetInteger(vaddr), sizeof(T));
- });
+ [&]() { HandleRasterizerDownload(GetInteger(vaddr), sizeof(T)); });
if (ptr) {
std::memcpy(&result, ptr, sizeof(T));
}
@@ -721,7 +719,8 @@ struct Memory::Impl {
const size_t core = system.GetCurrentHostThreadID();
auto& current_area = rasterizer_areas[core];
const VAddr end_address = address + size;
- if (current_area.start_address <= address && end_address <= current_area.end_address) [[likely]] {
+ if (current_area.start_address <= address && end_address <= current_area.end_address)
+ [[likely]] {
return;
}
current_area = system.GPU().OnCPURead(address, size);