archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 07:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fixup image-in data length calculations

Browse source
This commit is contained in:
kd-11 2021-08-17 22:58:33 +03:00 • committed by kd-11
parent 8848dc6673
commit 705693ecf8
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/RSX/rsx_methods.cpp
View file

@ -1206,9 +1206,8 @@ namespace rsx
const u32 nb_lines = std::min(clip_h, in_h); const u32 nb_lines = std::min(clip_h, in_h);
const u32 data_length = nb_lines * src_line_length; const u32 data_length = nb_lines * src_line_length;
src_address = get_address(src_offset, src_dma, data_length); if (src_address = get_address(src_offset, src_dma, data_length);
!src_address || !dst_address)
if (!src_address || !dst_address)
{ {
rsx->recover_fifo(); rsx->recover_fifo();
return; return;
@ -1228,11 +1227,11 @@ namespace rsx
} }
else else
{ {
const u32 data_length = in_pitch * (in_h - 1) + src_line_length; const u16 read_h = std::min(static_cast<u16>(clip_h / scale_y), in_h);
const u32 data_length = in_pitch * (read_h - 1) + src_line_length;
src_address = get_address(src_offset, src_dma, data_length); if (src_address = get_address(src_offset, src_dma, data_length);
!src_address || !dst_address)
if (!src_address || !dst_address)
{ {
rsx->recover_fifo(); rsx->recover_fifo();
return; return;