summaryrefslogtreecommitdiff
path: root/src/video_core/dma_pusher.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-06 20:19:20 -0500
committerGravatar GitHub2019-02-06 20:19:20 -0500
commit10ab714fe015b28215ce61e6b4f9085c954a409d (patch)
tree3c9d5c9ad759749d53773c6416be38d476d483bf /src/video_core/dma_pusher.cpp
parentMerge pull request #2071 from ReinUsesLisp/dsa-texture (diff)
parentvideo_core: Assert on invalid GPU to CPU address queries (diff)
downloadyuzu-10ab714fe015b28215ce61e6b4f9085c954a409d.tar.gz
yuzu-10ab714fe015b28215ce61e6b4f9085c954a409d.tar.xz
yuzu-10ab714fe015b28215ce61e6b4f9085c954a409d.zip
Merge pull request #2042 from ReinUsesLisp/nouveau-tex
maxwell_3d: Allow texture handles with TIC id zero
Diffstat (limited to 'src/video_core/dma_pusher.cpp')
-rw-r--r--src/video_core/dma_pusher.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index 63a958f11..eb9bf1878 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -35,8 +35,10 @@ void DmaPusher::DispatchCalls() {
35bool DmaPusher::Step() { 35bool DmaPusher::Step() {
36 if (dma_get != dma_put) { 36 if (dma_get != dma_put) {
37 // Push buffer non-empty, read a word 37 // Push buffer non-empty, read a word
38 const CommandHeader command_header{ 38 const auto address = gpu.MemoryManager().GpuToCpuAddress(dma_get);
39 Memory::Read32(*gpu.MemoryManager().GpuToCpuAddress(dma_get))}; 39 ASSERT_MSG(address, "Invalid GPU address");
40
41 const CommandHeader command_header{Memory::Read32(*address)};
40 42
41 dma_get += sizeof(u32); 43 dma_get += sizeof(u32);
42 44