diff options
| author |  bunnei | 2019-03-16 21:59:45 -0400 |
|---|---|---|
| committer |  GitHub | 2019-03-16 21:59:45 -0400 |
| commit | 2392e146b09c2a4b3bb557bb3a20c4afc7f75957 (patch) | |
| tree | 1eafa50be7af78d74b4781fbe858277ac8ab1d35 /src/video_core/dma_pusher.cpp | |
| parent | Merge pull request #2243 from bunnei/mem-simplify-cache (diff) | |
| parent | video_core: Refactor to use MemoryManager interface for all memory access. (diff) | |
| download | yuzu-2392e146b09c2a4b3bb557bb3a20c4afc7f75957.tar.gz yuzu-2392e146b09c2a4b3bb557bb3a20c4afc7f75957.tar.xz yuzu-2392e146b09c2a4b3bb557bb3a20c4afc7f75957.zip | |
Merge pull request #2244 from bunnei/gpu-mem-refactor
video_core: Refactor to use MemoryManager interface for all memory access.
Diffstat (limited to 'src/video_core/dma_pusher.cpp')
| -rw-r--r-- | src/video_core/dma_pusher.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index bff1a37ff..8b1bea1ae 100644 --- a/src/video_core/dma_pusher.cpp +++ b/src/video_core/dma_pusher.cpp | |||
| @@ -55,12 +55,9 @@ bool DmaPusher::Step() { | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | // Push buffer non-empty, read a word | 57 | // Push buffer non-empty, read a word |
| 58 | const auto address = gpu.MemoryManager().GpuToCpuAddress(dma_get); | ||
| 59 | ASSERT_MSG(address, "Invalid GPU address"); | ||
| 60 | |||
| 61 | command_headers.resize(command_list_header.size); | 58 | command_headers.resize(command_list_header.size); |
| 62 | 59 | gpu.MemoryManager().ReadBlock(dma_get, command_headers.data(), | |
| 63 | Memory::ReadBlock(*address, command_headers.data(), command_list_header.size * sizeof(u32)); | 60 | command_list_header.size * sizeof(u32)); |
| 64 | 61 | ||
| 65 | for (const CommandHeader& command_header : command_headers) { | 62 | for (const CommandHeader& command_header : command_headers) { |
| 66 | 63 | ||