Skip to content

Commit 3f4c01a

Browse files
authored
Merge pull request #17298 from hrydgard/godfather-present-workaround
Don't try to present from little temp framebuffers used by Godfather to draw text
2 parents 8a20922 + b1f8830 commit 3f4c01a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Core/HLE/sceKernelModule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load
12671267
// Copy the name to ensure it's null terminated.
12681268
char name[32]{};
12691269
strncpy(name, head->modname, ARRAY_SIZE(head->modname));
1270-
SaveDecryptedEbootToStorageMedia(ptr, elfSize, name);
1270+
SaveDecryptedEbootToStorageMedia(ptr, (u32)elfSize, name);
12711271
}
12721272
}
12731273
}

GPU/Common/FramebufferManagerCommon.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,11 @@ void FramebufferManagerCommon::CopyDisplayToOutput(bool reallyDirty) {
15251525
}
15261526
}
15271527

1528+
// Reject too-tiny framebuffers to display (Godfather, see issue #16915).
1529+
if (vfb && vfb->height < 64) {
1530+
vfb = nullptr;
1531+
}
1532+
15281533
if (!vfb) {
15291534
if (Memory::IsValidAddress(fbaddr)) {
15301535
// The game is displaying something directly from RAM. In GTA, it's decoded video.

0 commit comments

Comments
 (0)