Skip to content

Commit ce64ae2

Browse files
authored
Merge pull request hrydgard#20574 from hrydgard/ffii-copy-texture-fix
Make the check for framebuffer copy targets slightly more lenient for tiny copies.
2 parents 2134f52 + 67ea1a1 commit ce64ae2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

GPU/Common/FramebufferManagerCommon.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,9 +2070,9 @@ bool FramebufferManagerCommon::NotifyFramebufferCopy(u32 src, u32 dst, int size,
20702070
if (!ignoreDstBuffer && dst >= vfb_address && (dst + size <= vfb_address + vfb_size || dst == vfb_address)) {
20712071
const u32 offset = dst - vfb_address;
20722072
const u32 yOffset = offset / vfb_byteStride;
2073-
if ((offset % vfb_byteStride) == 0 && (size == vfb_byteWidth || (size % vfb_byteStride) == 0)) {
2073+
if ((offset % vfb_byteStride) == 0 && (size <= vfb_byteWidth || (size % vfb_byteStride) == 0)) {
20742074
dstCandidate.y = yOffset;
2075-
dstCandidate.h = (size == vfb_byteWidth) ? 1 : std::min((u32)size / vfb_byteStride, (u32)vfb->height);
2075+
dstCandidate.h = (size <= vfb_byteWidth) ? 1 : std::min((u32)size / vfb_byteStride, (u32)vfb->height);
20762076
dstCandidates.push_back(dstCandidate);
20772077
}
20782078
}

assets/compat.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,6 +1164,9 @@ ULES01510 = true
11641164
# Activision Hits Remixed
11651165
ULES00640 = true
11661166
ULUS10186 = true
1167+
# Fortix (#20436)
1168+
NPUZ00016 = true
1169+
NPEZ00096 = true
11671170

11681171
[MemstickFixedFree]
11691172
# Assassin's Creed : Bloodlines - issue #12761

0 commit comments

Comments
 (0)