archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 23:11:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Improve texture sourcing and clipping when reverse scanning is enabled

Browse source 
- When reverse scanning, offsets are inverted and offset value of 0 is logically equivalent to an offset of -1
- Add an explicit message if clipping happens to avoid silent errors/bugs
This commit is contained in:
kd-11 2019-04-11 17:16:02 +03:00 • committed by kd-11
parent 0d415407c7
commit df3b46a611
2 changed files with 87 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -831,16 +831,14 @@ namespace rsx
auto in_x = (u16)std::floor(method_registers.blit_engine_in_x());
auto in_y = (u16)std::floor(method_registers.blit_engine_in_y());
if ((in_x + in_y) && fabsf(fabsf(scale_x * scale_y) - 1.f) > 0.000001f)
if (UNLIKELY(in_x || in_y))
{
// Scaling operation, check for subpixel correction offsets
if (in_x > 1 || in_y > 1)
if (scale_x < 0.f || scale_y < 0.f || fabsf(fabsf(scale_x * scale_y) - 1.f) > 0.000001f)
{
LOG_ERROR(RSX, "Unexpected blit input setup; DT/S=%f,%f, in_x=%d, in_y=%d", scale_x, scale_y, in_x, in_y);
// Scaling operation, check for subpixel correction offsets
if (in_x == 1) in_x = 0;
if (in_y == 1) in_y = 0;
}
if (in_x == 1) in_x = 0;
if (in_y == 1) in_y = 0;
}
// Clipping
@ -967,18 +965,18 @@ namespace rsx
return;
}
blit_src_info src_info = {};
blit_dst_info dst_info = {};
if (!g_cfg.video.force_cpu_blit_processing && (dst_dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER || src_dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER))
{
blit_src_info src_info = {};
blit_dst_info dst_info = {};
src_info.format = src_color_format;
src_info.origin = in_origin;
src_info.width = in_w;
src_info.height = in_h;
src_info.pitch = in_pitch;
src_info.offset_x = (u16)in_x;
src_info.offset_y = (u16)in_y;
src_info.offset_x = in_x;
src_info.offset_y = in_y;
src_info.rsx_address = src_address;
src_info.pixels = pixels_src;