mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 13:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix span copy after refactoring

Browse Source 
- Add range check at fast path.
- Fix typo in element by element copying.
Should fix #10385
This commit is contained in:
Nekotekina 2021-06-01 20:28:49 +03:00
parent 8405314399
commit f2d6b52561
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/RSX/Common/TextureUtils.cpp
View File

@ -36,7 +36,7 @@ struct copy_unmodified_block
{ {
// Fast copy // Fast copy
const auto data_length = src_pitch_in_block * words_per_block * row_count * depth; const auto data_length = src_pitch_in_block * words_per_block * row_count * depth;
std::copy_n(src.begin(), data_length, dst.begin()); std::copy_n(src.begin(), std::min<usz>({data_length, src.size(), dst.size()}), dst.begin());
return; return;
} }
@ -55,7 +55,7 @@ struct copy_unmodified_block
for (int row = 0; row < row_count; ++row) for (int row = 0; row < row_count; ++row)
{ {
// NNOTE: src_offset is already shifted along the border at initialization // NOTE: src_offset is already shifted along the border at initialization
std::copy_n(src.begin() + src_offset, width_in_words, dst.begin() + dst_offset); std::copy_n(src.begin() + src_offset, width_in_words, dst.begin() + dst_offset);
src_offset += src_pitch_in_words; src_offset += src_pitch_in_words;
@ -151,7 +151,7 @@ struct copy_unmodified_block_vtc
for (u32 i = 0; i < row_element_count; i += 1) for (u32 i = 0; i < row_element_count; i += 1)
{ {
// Copy one span (8 bytes for DXT1 or 16 bytes for DXT5) // Copy one span (8 bytes for DXT1 or 16 bytes for DXT5)
dst[dst_offset + i] = src[src_offset + i]; dst[dst_offset + i] = src[src_offset + i * 4];
} }
dst_offset += row_element_count; dst_offset += row_element_count;