From 8866a3d6a9a43183df693238a890c96a30932da1 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Fri, 9 Aug 2019 22:54:26 +0300 Subject: [PATCH] rsx: Cleanup for blit engine fixes --- rpcs3/Emu/RSX/rsx_methods.cpp | 2 ++ rpcs3/Emu/RSX/rsx_utils.cpp | 7 ------- rpcs3/Emu/RSX/rsx_utils.h | 7 ------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index a3e4c675a8..1a2eaae417 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -1115,6 +1115,8 @@ namespace rsx { if (need_clip) { + temp3.resize(out_pitch * clip_h); + if (need_convert) { temp2.resize(out_pitch * std::max(convert_h, (u32)clip_h)); diff --git a/rpcs3/Emu/RSX/rsx_utils.cpp b/rpcs3/Emu/RSX/rsx_utils.cpp index a72ceca513..d285e1410e 100644 --- a/rpcs3/Emu/RSX/rsx_utils.cpp +++ b/rpcs3/Emu/RSX/rsx_utils.cpp @@ -38,13 +38,6 @@ namespace rsx } } - void clip_image(std::unique_ptr& dst, const u8 *src, - int clip_x, int clip_y, int clip_w, int clip_h, int bpp, int src_pitch, int dst_pitch) - { - dst.reset(new u8[clip_h * dst_pitch]); - clip_image(dst.get(), src, clip_x, clip_y, clip_w, clip_h, bpp, src_pitch, dst_pitch); - } - //Convert decoded integer values for CONSTANT_BLEND_FACTOR into f32 array in 0-1 range std::array get_constant_blend_colors() { diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index ece11b4c5f..e2892712f2 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -425,18 +425,11 @@ namespace rsx const u8 *src, AVPixelFormat src_format, int src_width, int src_height, int src_pitch, int src_slice_h, bool bilinear); void clip_image(u8 *dst, const u8 *src, int clip_x, int clip_y, int clip_w, int clip_h, int bpp, int src_pitch, int dst_pitch); - void clip_image(std::unique_ptr& dst, const u8 *src, int clip_x, int clip_y, int clip_w, int clip_h, int bpp, int src_pitch, int dst_pitch); void convert_le_f32_to_be_d24(void *dst, void *src, u32 row_length_in_texels, u32 num_rows); void convert_le_d24x8_to_be_d24x8(void *dst, void *src, u32 row_length_in_texels, u32 num_rows); void convert_le_d24x8_to_le_f32(void *dst, void *src, u32 row_length_in_texels, u32 num_rows); - void fill_scale_offset_matrix(void *dest_, bool transpose, - float offset_x, float offset_y, float offset_z, - float scale_x, float scale_y, float scale_z); - void fill_window_matrix(void *dest, bool transpose); - void fill_viewport_matrix(void *buffer, bool transpose); - std::array get_constant_blend_colors(); /**