thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3967 from raven02/patch-17

Browse source 
Quick fix FF4 CC missing title text in framebuffer-to-memory mode
This commit is contained in:
Henrik Rydgård 2013-09-30 03:39:47 -07:00
commit add0350b56
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
GPU/GLES/Framebuffer.cpp
View file

@ -907,14 +907,13 @@ void FramebufferManager::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool s
#ifdef USING_GLES2
PackFramebufferSync_(nvfb); // synchronous glReadPixels
#else
if(gl_extensions.PBO_ARB || !gl_extensions.ATIClampBug)
{
if(!sync) {
PackFramebufferAsync_(nvfb); // asynchronous glReadPixels using PBOs
} else {
PackFramebufferSync_(nvfb); // synchronous glReadPixels
if(gl_extensions.PBO_ARB || !gl_extensions.ATIClampBug) {
if(!sync) {
PackFramebufferAsync_(nvfb); // asynchronous glReadPixels using PBOs
} else {
PackFramebufferSync_(nvfb); // synchronous glReadPixels
}
}
}
#endif
}
}
@ -1304,9 +1303,10 @@ void FramebufferManager::DecimateFBOs() {
VirtualFramebuffer *vfb = vfbs_[i];
int age = frameLastFramebufUsed - std::max(vfb->last_frame_render, vfb->last_frame_used);
if (vfb == displayFramebuf_ || vfb == prevDisplayFramebuf_ || vfb == prevPrevDisplayFramebuf_) {
if(updateVram && age == 0 && !vfb->memoryUpdated)
if(updateVram && age == 0 && !vfb->memoryUpdated && vfb == displayFramebuf_)
ReadFramebufferToMemory(vfb);
if (vfb == displayFramebuf_ || vfb == prevDisplayFramebuf_ || vfb == prevPrevDisplayFramebuf_) {
continue;
}