From 7993866ee4feb5208d279636b114f071276fb3f7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 17 Jan 2016 21:58:49 -0800 Subject: [PATCH 1/2] Invalidate FBOs when video width is larger. This way we won't try to upload them wrong. Fixes #8392. --- GPU/Common/FramebufferCommon.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index e6c59a9f2e..fd9102bba6 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -497,7 +497,11 @@ void FramebufferManagerCommon::NotifyVideoUpload(u32 addr, int size, int width, vfb->last_frame_render = gpuStats.numFlips; } - // TODO: Check width? + if (vfb->fb_stride < width) { + INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format); + DestroyFramebuf(vfb); + vfbs_.erase(std::remove(vfbs_.begin(), vfbs_.end(), vfb), vfbs_.end()); + } } } From 99eb3f8a94c9c7b0bab4da9f9b5e1dc1b38f2277 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 17 Jan 2016 22:33:05 -0800 Subject: [PATCH 2/2] Instead, let's resize it in case there's rendering. --- GPU/Common/FramebufferCommon.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index fd9102bba6..e1122ab11d 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -498,9 +498,12 @@ void FramebufferManagerCommon::NotifyVideoUpload(u32 addr, int size, int width, } if (vfb->fb_stride < width) { - INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format); - DestroyFramebuf(vfb); - vfbs_.erase(std::remove(vfbs_.begin(), vfbs_.end(), vfb), vfbs_.end()); + DEBUG_LOG(ME, "Changing stride for %08x from %d to %d", addr, vfb->fb_stride, width); + const int bpp = fmt == GE_FORMAT_8888 ? 4 : 2; + ResizeFramebufFBO(vfb, width, size / (bpp * width)); + vfb->fb_stride = width; + // This might be a bit wider than necessary, but we'll redetect on next render. + vfb->width = vfb->width = width; } } }