From 5fd0adcb6ab4f1dc4e3f367694efb3c8c2cfa493 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 8 Jun 2014 15:45:41 -0700 Subject: [PATCH 1/3] Fix framebuf blit on resize. --- GPU/GLES/Framebuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index a759231dc1..42fbb9e546 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -740,6 +740,7 @@ void FramebufferManager::RebindFramebuffer() { void FramebufferManager::ResizeFramebufFBO(VirtualFramebuffer *vfb, u16 w, u16 h, bool force) { float renderWidthFactor = (float)vfb->renderWidth / (float)vfb->bufferWidth; float renderHeightFactor = (float)vfb->renderHeight / (float)vfb->bufferHeight; + VirtualFramebuffer old = *vfb; if (force) { vfb->bufferWidth = w; @@ -788,7 +789,6 @@ void FramebufferManager::ResizeFramebufFBO(VirtualFramebuffer *vfb, u16 w, u16 h return; } - VirtualFramebuffer old = *vfb; vfb->fbo = fbo_create(vfb->renderWidth, vfb->renderHeight, 1, true, vfb->colorDepth); if (old.fbo) { INFO_LOG(SCEGE, "Resizing FBO for %08x : %i x %i x %i", vfb->fb_address, w, h, vfb->format); From 125a440e71b320dc1adea6e6278440f3ecb9565e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 8 Jun 2014 15:46:23 -0700 Subject: [PATCH 2/3] Try scissor/region height if viewport is == 512. Fixes Tales of Phantasia X menu in towns, where it uses a 480 tall framebuffer but specifies a 512 tall viewport. --- GPU/GLES/Framebuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 42fbb9e546..c096cbc125 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -673,7 +673,7 @@ void FramebufferManager::EstimateDrawingSize(int &drawing_width, int &drawing_he } // Assume no buffer is > 512 tall, it couldn't be textured or displayed fully if so. - if (drawing_height > MAX_FRAMEBUF_HEIGHT) { + if (drawing_height >= MAX_FRAMEBUF_HEIGHT) { if (region_height < MAX_FRAMEBUF_HEIGHT) { drawing_height = region_height; } else if (scissor_height < MAX_FRAMEBUF_HEIGHT) { From 375bc34c4bd397022096e4fe20b499c37c0681b1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 8 Jun 2014 17:29:53 -0700 Subject: [PATCH 3/3] Skip direct blocktransfer draw in buffered. It isn't needed anymore, and causes glitches in Tales of Phantasia X. --- GPU/GLES/Framebuffer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index c096cbc125..e7ef7d11db 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -2227,9 +2227,8 @@ void FramebufferManager::NotifyBlockTransferAfter(u32 dstBasePtr, int dstStride, // TODO: Is this not handled by upload? Should we check !dstBuffer to avoid a double copy? if (((backBuffer != 0 && dstBasePtr == backBuffer) || (displayBuffer != 0 && dstBasePtr == displayBuffer)) && - dstStride == 512 && height == 272) { - // TODO: Use displayFormat_ instead of GE_FORMAT_8888? - DrawFramebuffer(Memory::GetPointerUnchecked(dstBasePtr), GE_FORMAT_8888, 512, false); + dstStride == 512 && height == 272 && !useBufferedRendering_) { + DrawFramebuffer(Memory::GetPointerUnchecked(dstBasePtr), displayFormat_, 512, false); } if (MayIntersectFramebuffer(srcBasePtr) || MayIntersectFramebuffer(dstBasePtr)) {