notsoyuzu
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fermi2D: Use a different formula for delimiting blit areas.

This commit is contained in:
Fernando Sahmkow 2019-10-17 18:21:01 -04:00
parent 57a46c69f1
commit c0eb1aecfd
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/video_core/engines/fermi_2d.cpp
View File

@ -28,6 +28,13 @@ void Fermi2D::CallMethod(const GPU::MethodCall& method_call) {
} }
} }
std::pair<u32, u32> DelimitLine(u32 src_1, u32 src_2, u32 dst_1, u32 dst_2, u32 src_line) {
const u32 line_a = src_2 - src_1;
const u32 line_b = dst_2 - dst_1;
const u32 excess = std::max<s32>(0, line_a - src_line + src_1);
return {line_b - (excess * line_b) / line_a, excess};
}
void Fermi2D::HandleSurfaceCopy() { void Fermi2D::HandleSurfaceCopy() {
LOG_DEBUG(HW_GPU, "Requested a surface copy with operation {}", LOG_DEBUG(HW_GPU, "Requested a surface copy with operation {}",
static_cast<u32>(regs.operation)); static_cast<u32>(regs.operation));
@ -47,20 +54,27 @@ void Fermi2D::HandleSurfaceCopy() {
src_blit_x2 = static_cast<u32>((regs.blit_src_x >> 32) + regs.blit_dst_width); src_blit_x2 = static_cast<u32>((regs.blit_src_x >> 32) + regs.blit_dst_width);
src_blit_y2 = static_cast<u32>((regs.blit_src_y >> 32) + regs.blit_dst_height); src_blit_y2 = static_cast<u32>((regs.blit_src_y >> 32) + regs.blit_dst_height);
} }
const u32 dst_blit_x2 = regs.blit_dst_x + regs.blit_dst_width; u32 dst_blit_x2 = regs.blit_dst_x + regs.blit_dst_width;
const u32 dst_blit_y2 = regs.blit_dst_x + regs.blit_dst_height; u32 dst_blit_y2 = regs.blit_dst_y + regs.blit_dst_height;
const u32 excess_src_x2 = std::max<s32>(0, dst_blit_x2 - regs.dst.width); const auto [new_dst_w, src_excess_x] =
const u32 excess_src_y2 = std::max<s32>(0, dst_blit_y2 - regs.dst.height); DelimitLine(src_blit_x1, src_blit_x2, regs.blit_dst_x, dst_blit_x2, regs.src.width);
const u32 excess_dst_x2 = std::max<s32>(0, src_blit_x2 - regs.src.width); const auto [new_dst_h, src_excess_y] =
const u32 excess_dst_y2 = std::max<s32>(0, src_blit_y2 - regs.src.height); DelimitLine(src_blit_y1, src_blit_y2, regs.blit_dst_y, dst_blit_y2, regs.src.height);
dst_blit_x2 = new_dst_w + regs.blit_dst_x;
const Common::Rectangle<u32> src_rect{ src_blit_x2 = src_blit_x2 - src_excess_x;
src_blit_x1, src_blit_y1, std::min<u32>(regs.src.width, src_blit_x2) - excess_src_x2, dst_blit_y2 = new_dst_h + regs.blit_dst_y;
std::min<u32>(regs.src.height, src_blit_y2) - excess_src_y2}; src_blit_y2 = src_blit_y2 - src_excess_y;
const Common::Rectangle<u32> dst_rect{ const auto [new_src_w, dst_excess_x] =
regs.blit_dst_x, regs.blit_dst_y, DelimitLine(regs.blit_dst_x, dst_blit_x2, src_blit_x1, src_blit_x2, regs.dst.width);
std::min<u32>(regs.dst.width, dst_blit_x2) - excess_dst_x2, const auto [new_src_h, dst_excess_y] =
std::min<u32>(regs.dst.height, dst_blit_y2) - excess_dst_y2}; DelimitLine(regs.blit_dst_y, dst_blit_y2, src_blit_y1, src_blit_y2, regs.dst.height);
src_blit_x2 = new_src_w + src_blit_x1;
dst_blit_x2 = dst_blit_x2 - dst_excess_x;
src_blit_y2 = new_src_h + src_blit_y1;
dst_blit_y2 = dst_blit_y2 - dst_excess_y;
const Common::Rectangle<u32> src_rect{src_blit_x1, src_blit_y1, src_blit_x2, src_blit_y2};
const Common::Rectangle<u32> dst_rect{regs.blit_dst_x, regs.blit_dst_y, dst_blit_x2,
dst_blit_y2};
Config copy_config; Config copy_config;
copy_config.operation = regs.operation; copy_config.operation = regs.operation;
copy_config.filter = regs.blit_control.filter; copy_config.filter = regs.blit_control.filter;