archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 10:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rsx: Implement crash-proofing for image_in dst/src formats

Browse source
This commit is contained in:
Eladash 2021-08-13 20:12:54 +03:00 • committed by kd-11
parent 83624e1f68
commit 107641626a
3 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1090,7 +1090,16 @@ namespace rsx
if (operation != rsx::blit_engine::transfer_operation::srccopy)
{
fmt::throw_exception("NV3089_IMAGE_IN_SIZE: unknown operation (%d)", static_cast<u8>(operation));
rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown operation (0x%x)", method_registers.registers[NV3089_SET_OPERATION]);
rsx->recover_fifo();
return;
}
if (src_color_format == rsx::blit_engine::transfer_source_format::invalid)
{
rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown src color format (0x%x)", method_registers.registers[NV3089_SET_COLOR_FORMAT]);
rsx->recover_fifo();
return;
}
const u32 src_offset = method_registers.blit_engine_input_offset();
@ -1113,6 +1122,14 @@ namespace rsx
out_pitch = method_registers.blit_engine_output_pitch_nv3062();
out_alignment = method_registers.blit_engine_output_alignment_nv3062();
is_block_transfer = fcmp(scale_x, 1.f) && fcmp(scale_y, 1.f);
if (dst_color_format == rsx::blit_engine::transfer_destination_format::invalid)
{
rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV3062 dst color format (0x%x)", method_registers.registers[NV3062_SET_COLOR_FORMAT]);
rsx->recover_fifo();
return;
}
break;
}
case blit_engine::context_surface::swizzle2d:
@ -1120,6 +1137,14 @@ namespace rsx
dst_dma = method_registers.blit_engine_nv309E_location();
dst_offset = method_registers.blit_engine_nv309E_offset();
dst_color_format = method_registers.blit_engine_output_format_nv309E();
if (dst_color_format == rsx::blit_engine::transfer_destination_format::invalid)
{
rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV309E dst color format (0x%x)", method_registers.registers[NV309E_SET_FORMAT]);
rsx->recover_fifo();
return;
}
break;
}
default: