From 13d626fc217c4286a80071c5885eee2ab8795d62 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Tue, 16 Apr 2019 10:19:52 -0400 Subject: [PATCH] Use ReadBlockUnsafe for fetyching DMA CommandLists --- src/video_core/dma_pusher.cpp | 4 ++-- src/video_core/memory_manager.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index 046d047cbe..6674d94059 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 084d834c85..017b051cfb 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; using VMAHandle = VMAMap::const_iterator;