yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #2491 from FernandoS27/dma-fix 

Dma_pusher: ASSERT on empty command_list
This commit is contained in:
Hexagon12 2019-05-19 16:27:15 +01:00 committed by GitHub
parent f8b1e53369 9e98100c94
commit b94b08fa6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/dma_pusher.cpp
View File

@ -40,6 +40,13 @@ bool DmaPusher::Step() {
} }
const CommandList& command_list{dma_pushbuffer.front()}; 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++]}; const CommandListHeader command_list_header{command_list[dma_pushbuffer_subindex++]};
GPUVAddr dma_get = command_list_header.addr; GPUVAddr dma_get = command_list_header.addr;
GPUVAddr dma_put = dma_get + command_list_header.size * sizeof(u32); GPUVAddr dma_put = dma_get + command_list_header.size * sizeof(u32);