summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines/fermi_2d.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-10-18 00:21:01 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2019-10-18 00:21:01 +0200
commitc0eb1aecfd6579409a23e56dc5cea8f19aa7e064 (patch)
treec19b032ee016dc699a22fcfa36338ac1676da0f7 /src/video_core/engines/fermi_2d.cpp
parentFermi2D: limit blit area to only available area (diff)
downloadyuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar.gz
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar.bz2
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar.lz
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar.xz
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.tar.zst
yuzu-c0eb1aecfd6579409a23e56dc5cea8f19aa7e064.zip
Diffstat (limited to 'src/video_core/engines/fermi_2d.cpp')
-rw-r--r--src/video_core/engines/fermi_2d.cpp42
1 files changed, 28 insertions, 14 deletions
diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp
index c2d4dcc09..85d308e26 100644
--- a/src/video_core/engines/fermi_2d.cpp
+++ b/src/video_core/engines/fermi_2d.cpp
@@ -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() {
LOG_DEBUG(HW_GPU, "Requested a surface copy with 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_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;
- const u32 dst_blit_y2 = regs.blit_dst_x + regs.blit_dst_height;
- const u32 excess_src_x2 = std::max<s32>(0, dst_blit_x2 - regs.dst.width);
- const u32 excess_src_y2 = std::max<s32>(0, dst_blit_y2 - regs.dst.height);
- const u32 excess_dst_x2 = std::max<s32>(0, src_blit_x2 - regs.src.width);
- const u32 excess_dst_y2 = std::max<s32>(0, src_blit_y2 - regs.src.height);
-
- const Common::Rectangle<u32> src_rect{
- src_blit_x1, src_blit_y1, std::min<u32>(regs.src.width, src_blit_x2) - excess_src_x2,
- std::min<u32>(regs.src.height, src_blit_y2) - excess_src_y2};
- const Common::Rectangle<u32> dst_rect{
- regs.blit_dst_x, regs.blit_dst_y,
- std::min<u32>(regs.dst.width, dst_blit_x2) - excess_dst_x2,
- std::min<u32>(regs.dst.height, dst_blit_y2) - excess_dst_y2};
+ u32 dst_blit_x2 = regs.blit_dst_x + regs.blit_dst_width;
+ u32 dst_blit_y2 = regs.blit_dst_y + regs.blit_dst_height;
+ const auto [new_dst_w, src_excess_x] =
+ DelimitLine(src_blit_x1, src_blit_x2, regs.blit_dst_x, dst_blit_x2, regs.src.width);
+ const auto [new_dst_h, src_excess_y] =
+ 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;
+ src_blit_x2 = src_blit_x2 - src_excess_x;
+ dst_blit_y2 = new_dst_h + regs.blit_dst_y;
+ src_blit_y2 = src_blit_y2 - src_excess_y;
+ const auto [new_src_w, dst_excess_x] =
+ DelimitLine(regs.blit_dst_x, dst_blit_x2, src_blit_x1, src_blit_x2, regs.dst.width);
+ const auto [new_src_h, dst_excess_y] =
+ 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;
copy_config.operation = regs.operation;
copy_config.filter = regs.blit_control.filter;