summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHexagon12 <Hexagon12@users.noreply.github.com>2019-05-19 17:27:15 +0200
committerGitHub <noreply@github.com>2019-05-19 17:27:15 +0200
commitb94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7 (patch)
tree48f5ebec018b821deeb49765dae91b06c9642545
parentMerge pull request #2452 from FernandoS27/raster-cache-fix (diff)
parentDma_pusher: ASSERT on empty command_list (diff)
downloadyuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar.gz
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar.bz2
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar.lz
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar.xz
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.tar.zst
yuzu-b94b08fa6fa385aaf2d869f6d1dfc2033ceb0ba7.zip
-rw-r--r--src/video_core/dma_pusher.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index 036e66f05..3175579cc 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -40,6 +40,13 @@ bool DmaPusher::Step() {
}
const CommandList& command_list{dma_pushbuffer.front()};
+ ASSERT_OR_EXECUTE(!command_list.empty(), {
+ // Somehow the command_list is empty, in order to avoid a crash
+ // We ignore it and assume its size is 0.
+ dma_pushbuffer.pop();
+ dma_pushbuffer_subindex = 0;
+ return true;
+ });
const CommandListHeader command_list_header{command_list[dma_pushbuffer_subindex++]};
GPUVAddr dma_get = command_list_header.addr;
GPUVAddr dma_put = dma_get + command_list_header.size * sizeof(u32);