RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

rsx: Improve blit format mismatch detection

Browse Source
This commit is contained in:
kd-11 2019-11-18 22:11:07 +03:00 committed by kd-11
parent 41c3180276
commit fd751e3e7b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/GL/GLHelpers.cpp
View File

@ -418,7 +418,7 @@ namespace gl
}
}
verify(HERE), real_src->aspect() == real_dst->aspect();
verify("Incompatible source and destination format!" HERE), real_src->aspect() == real_dst->aspect();
const bool is_depth_copy = (real_src->aspect() != image_aspect::color);
const filter interp = (linear_interpolation && !is_depth_copy) ? filter::linear : filter::nearest;

7
rpcs3/Emu/RSX/VK/VKTexture.cpp
View File

@ -849,9 +849,6 @@ namespace vk
void blitter::scale_image(vk::command_buffer& cmd, vk::image* src, vk::image* dst, areai src_area, areai dst_area, bool interpolate, const rsx::typeless_xfer& xfer_info)
{
const auto src_aspect = vk::get_aspect_flags(src->info.format);
const auto dst_aspect = vk::get_aspect_flags(dst->info.format);
vk::image* real_src = src;
vk::image* real_dst = dst;
@ -930,8 +927,10 @@ namespace vk
src_area.flip_vertical();
}
verify("Incompatible source and destination format!" HERE), real_src->aspect() == real_dst->aspect();
copy_scaled_image(cmd, real_src->value, real_dst->value, real_src->current_layout, real_dst->current_layout,
src_area, dst_area, 1, dst_aspect, real_src->info.format == real_dst->info.format,
src_area, dst_area, 1, real_src->aspect(), real_src->info.format == real_dst->info.format,
interpolate ? VK_FILTER_LINEAR : VK_FILTER_NEAREST, real_src->info.format, real_dst->info.format);
if (real_dst != dst)