Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: fix image_in swizzled texture crash

Browse Source
This commit is contained in:
Jake
2017-12-07 01:31:18 -06:00
committed by Ivan
parent 0b3fbf1d4c
commit d0013679c0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/rsx_methods.cpp
+8 -4
View File
@@ -837,21 +837,25 @@ namespace rsx
u8* linear_pixels = pixels_src; u8* linear_pixels = pixels_src;
u8* swizzled_pixels = temp2.get(); u8* swizzled_pixels = temp2.get();
// restrict output to size of swizzle
const u16 sw_in_w = std::min(out_w, sw_width);
const u16 sw_in_h = std::min(out_h, sw_height);
// Check and pad texture out if we are given non square texture for swizzle to be correct // Check and pad texture out if we are given non square texture for swizzle to be correct
if (sw_width != out_w || sw_height != out_h) if (sw_width != sw_in_w || sw_height != sw_in_h)
{ {
sw_temp.reset(new u8[out_bpp * sw_width * sw_height]); sw_temp.reset(new u8[out_bpp * sw_width * sw_height]);
switch (out_bpp) switch (out_bpp)
{ {
case 1: case 1:
pad_texture<u8>(linear_pixels, sw_temp.get(), out_w, out_h, sw_width, sw_height); pad_texture<u8>(linear_pixels, sw_temp.get(), sw_in_w, sw_in_h, sw_width, sw_height);
break; break;
case 2: case 2:
pad_texture<u16>(linear_pixels, sw_temp.get(), out_w, out_h, sw_width, sw_height); pad_texture<u16>(linear_pixels, sw_temp.get(), sw_in_w, sw_in_h, sw_width, sw_height);
break; break;
case 4: case 4:
pad_texture<u32>(linear_pixels, sw_temp.get(), out_w, out_h, sw_width, sw_height); pad_texture<u32>(linear_pixels, sw_temp.get(), sw_in_w, sw_in_h, sw_width, sw_height);
break; break;
} }