Merge pull request #3754 from raven02/patch-5

Place in the two frames skip logic for FB to memory
This commit is contained in:
Henrik Rydgård 2013-09-13 07:41:34 -07:00
commit 18cf14a3d0
2 changed files with 4 additions and 3 deletions

View File

@ -1205,6 +1205,7 @@ std::vector<FramebufferInfo> FramebufferManager::GetFramebufferList() {
void FramebufferManager::DecimateFBOs() {
fbo_unbind();
currentRenderVfb_ = 0;
bool skiptwo = (gpuStats.numFlips % 2 == 0);
#ifndef USING_GLES2
bool useMem = g_Config.iRenderingMode == FB_READFBOMEMORY_GPU || g_Config.iRenderingMode == FB_READFBOMEMORY_CPU;
#else
@ -1214,8 +1215,8 @@ void FramebufferManager::DecimateFBOs() {
VirtualFramebuffer *vfb = vfbs_[i];
int age = frameLastFramebufUsed - std::max(vfb->last_frame_render, vfb->last_frame_used);
if(useMem && age == 0 && !vfb->memoryUpdated) {
ReadFramebufferToMemory(vfb);
if(useMem && skiptwo && age < FBO_OLD_AGE) {
ReadFramebufferToMemory(vfb);
}
if (vfb == displayFramebuf_ || vfb == prevDisplayFramebuf_ || vfb == prevPrevDisplayFramebuf_) {

2
native

@ -1 +1 @@
Subproject commit 67183f5822c3e28b51bb06b754e002c737feeccf
Subproject commit 997aae346bae42ef5a8d047bb3d09d757385d855