summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2022-01-29 17:42:28 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2022-01-29 17:42:28 +0100
commitf54280dafd82f83dac03a92ee0bce84e8ba4033e (patch)
treea87dc3093b48684020287800da4e3fffcec95567
parentMerge pull request #7791 from german77/wall_clock (diff)
downloadyuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar.gz
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar.bz2
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar.lz
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar.xz
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.tar.zst
yuzu-f54280dafd82f83dac03a92ee0bce84e8ba4033e.zip
-rw-r--r--src/video_core/engines/engine_upload.cpp1
-rw-r--r--src/video_core/memory_manager.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/engines/engine_upload.cpp b/src/video_core/engines/engine_upload.cpp
index 71d7e1473..9ac0e533c 100644
--- a/src/video_core/engines/engine_upload.cpp
+++ b/src/video_core/engines/engine_upload.cpp
@@ -32,6 +32,7 @@ void State::ProcessData(const u32 data, const bool is_last_call) {
}
const GPUVAddr address{regs.dest.Address()};
if (is_linear) {
+ memory_manager.FlushRegion(address, copy_size);
memory_manager.WriteBlock(address, inner_buffer.data(), copy_size);
} else {
UNIMPLEMENTED_IF(regs.dest.z != 0);
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 38d8d9d74..61bfe47c7 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -143,6 +143,8 @@ public:
[[nodiscard]] GPUVAddr Allocate(std::size_t size, std::size_t align);
void Unmap(GPUVAddr gpu_addr, std::size_t size);
+ void FlushRegion(GPUVAddr gpu_addr, size_t size) const;
+
private:
[[nodiscard]] PageEntry GetPageEntry(GPUVAddr gpu_addr) const;
void SetPageEntry(GPUVAddr gpu_addr, PageEntry page_entry, std::size_t size = page_size);
@@ -153,8 +155,6 @@ private:
void TryLockPage(PageEntry page_entry, std::size_t size);
void TryUnlockPage(PageEntry page_entry, std::size_t size);
- void FlushRegion(GPUVAddr gpu_addr, size_t size) const;
-
void ReadBlockImpl(GPUVAddr gpu_src_addr, void* dest_buffer, std::size_t size,
bool is_safe) const;
void WriteBlockImpl(GPUVAddr gpu_dest_addr, const void* src_buffer, std::size_t size,