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

rsx: Cleanup for blit engine fixes

Browse source
This commit is contained in:
kd-11 2019-08-09 22:54:26 +03:00 • committed by Ani
parent 8150095e8f
commit 8866a3d6a9
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1115,6 +1115,8 @@ namespace rsx
{ {
if (need_clip) if (need_clip)
{ {
temp3.resize(out_pitch * clip_h);
if (need_convert) if (need_convert)
{ {
temp2.resize(out_pitch * std::max(convert_h, (u32)clip_h)); temp2.resize(out_pitch * std::max(convert_h, (u32)clip_h));

7
rpcs3/Emu/RSX/rsx_utils.cpp
View file

@ -38,13 +38,6 @@ namespace rsx
} }
} }
void clip_image(std::unique_ptr<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)
{
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 //Convert decoded integer values for CONSTANT_BLEND_FACTOR into f32 array in 0-1 range
std::array<float, 4> get_constant_blend_colors() std::array<float, 4> get_constant_blend_colors()
{ {

7
rpcs3/Emu/RSX/rsx_utils.h
View file

@ -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); 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(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<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 convert_le_f32_to_be_d24(void *dst, void *src, u32 row_length_in_texels, u32 num_rows); 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_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 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<float, 4> get_constant_blend_colors(); std::array<float, 4> get_constant_blend_colors();
/** /**