summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-04-16 16:19:52 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-04-16 17:22:34 +0200
commit13d626fc217c4286a80071c5885eee2ab8795d62 (patch)
tree375697bccef4c12206b1eb8dfeb68e81e2378028
parentDocument unsafe versions and add BlockCopyUnsafe (diff)
downloadyuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar.gz
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar.bz2
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar.lz
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar.xz
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.tar.zst
yuzu-13d626fc217c4286a80071c5885eee2ab8795d62.zip
-rw-r--r--src/video_core/dma_pusher.cpp4
-rw-r--r--src/video_core/memory_manager.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index 046d047cb..6674d9405 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -57,8 +57,8 @@ bool DmaPusher::Step() {
// Push buffer non-empty, read a word
command_headers.resize(command_list_header.size);
- gpu.MemoryManager().ReadBlock(dma_get, command_headers.data(),
- command_list_header.size * sizeof(u32));
+ gpu.MemoryManager().ReadBlockUnsafe(dma_get, command_headers.data(),
+ command_list_header.size * sizeof(u32));
for (const CommandHeader& command_header : command_headers) {
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 084d834c8..017b051cf 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -65,7 +65,6 @@ public:
u8* GetPointer(GPUVAddr addr);
const u8* GetPointer(GPUVAddr addr) const;
-
/*
* ReadBlock and WriteBlock are full read and write operations over virtual
* GPU Memory. It's important to use these when GPU memory may not be continous
@@ -90,7 +89,6 @@ public:
void WriteBlockUnsafe(GPUVAddr dest_addr, const void* src_buffer, const std::size_t size);
void CopyBlockUnsafe(GPUVAddr dest_addr, GPUVAddr src_addr, const std::size_t size);
-
private:
using VMAMap = std::map<GPUVAddr, VirtualMemoryArea>;
using VMAHandle = VMAMap::const_iterator;