ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5179 from lioncash/cast 

Fifo: Remove unnecessary integral casts
This commit is contained in:
Matthew Parlane 2017-03-29 10:55:52 +13:00 committed by GitHub
parent 9930052725 41fbc659bf
commit 595c1f5597
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/Fifo.cpp
View File

@ -229,8 +229,7 @@ static void ReadDataFromFifo(u32 readPtr)
size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr; size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len)) if (len > (size_t)(FIFO_SIZE - existing_len))
{ {
PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, PanicAlert("FIFO out of bounds (existing %zu + new %zu > %u)", existing_len, len, FIFO_SIZE);
(unsigned long)FIFO_SIZE);
return; return;
} }
memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len); memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len);
@ -267,8 +266,7 @@ static void ReadDataFromFifoOnCPU(u32 readPtr)
size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr; size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len)) if (len > (size_t)(FIFO_SIZE - existing_len))
{ {
PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, PanicAlert("FIFO out of bounds (existing %zu + new %zu > %u)", existing_len, len, FIFO_SIZE);
(unsigned long)FIFO_SIZE);
return; return;
} }
} }