diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index 3844a8e2f9..d9c388ae41 100644 --- a/src/video_core/dma_pusher.cpp +++ b/src/video_core/dma_pusher.cpp @@ -83,13 +83,21 @@ bool DmaPusher::Step() { } if (header.size > 0) { - if (Settings::IsDMALevelDefault() ? (Settings::IsGPULevelMedium() || Settings::IsGPULevelHigh()) : Settings::IsDMALevelSafe()) { - Tegra::Memory::GpuGuestMemoryheaders(memory_manager, dma_state.dma_get, header.size, &command_headers); - ProcessCommands(headers); - } else { - Tegra::Memory::GpuGuestMemoryheaders(memory_manager, dma_state.dma_get, header.size, &command_headers); - ProcessCommands(headers); + const size_t command_bytes = static_cast(header.size) * sizeof(CommandHeader); + + if (memory_manager.IsMemoryDirty(dma_state.dma_get, command_bytes)) { + memory_manager.FlushRegion(dma_state.dma_get, command_bytes); } + + command_headers.resize_destructive(header.size); + if (Settings::IsDMALevelDefault() + ? (Settings::IsGPULevelMedium() || Settings::IsGPULevelHigh()) + : Settings::IsDMALevelSafe()) { + memory_manager.ReadBlock(dma_state.dma_get, command_headers.data(), command_bytes); + } else { + memory_manager.ReadBlockUnsafe(dma_state.dma_get, command_headers.data(), command_bytes); + } + ProcessCommands(command_headers); } if (++dma_pushbuffer_subindex >= command_list_size) {