diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-02-27 04:47:49 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-02-27 09:38:39 +0100 |
| commit | b9238edd0d0bfa7c88ad81ef00347b5194ebed77 (patch) | |
| tree | 73cbfa304b41edc3fc92f7b8e9bfb8832f701d49 /src/video_core/engines | |
| parent | common/vector_math: Move Vec[x] types into the Common namespace (diff) | |
| download | yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar.gz yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar.bz2 yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar.lz yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar.xz yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.tar.zst yuzu-b9238edd0d0bfa7c88ad81ef00347b5194ebed77.zip | |
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/fermi_2d.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/engines/maxwell_3d.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index ec1a57226..540dcc52c 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp @@ -44,10 +44,10 @@ void Fermi2D::HandleSurfaceCopy() { const u32 src_blit_y2{ static_cast<u32>((regs.blit_src_y + (regs.blit_dst_height * regs.blit_dv_dy)) >> 32)}; - const MathUtil::Rectangle<u32> src_rect{src_blit_x1, src_blit_y1, src_blit_x2, src_blit_y2}; - const MathUtil::Rectangle<u32> dst_rect{regs.blit_dst_x, regs.blit_dst_y, - regs.blit_dst_x + regs.blit_dst_width, - regs.blit_dst_y + regs.blit_dst_height}; + 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, + regs.blit_dst_x + regs.blit_dst_width, + regs.blit_dst_y + regs.blit_dst_height}; if (!rasterizer.AccelerateSurfaceCopy(regs.src, regs.dst, src_rect, dst_rect)) { UNIMPLEMENTED(); diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 0e3873ffd..584f51c48 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -503,7 +503,7 @@ public: f32 translate_z; INSERT_PADDING_WORDS(2); - MathUtil::Rectangle<s32> GetRect() const { + Common::Rectangle<s32> GetRect() const { return { GetX(), // left GetY() + GetHeight(), // top |