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

Stop clearing the buffer after blitting to it.

Browse source 
This only appeared to work because destroying an fbo unbinds the active
one.
This commit is contained in:
Unknown W. Brackets 2014-06-04 22:47:26 -07:00
parent e8ab820506
commit 115b959ef7
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
GPU/GLES/Framebuffer.cpp
View file

@ -877,12 +877,6 @@ void FramebufferManager::DoSetRenderFrameBuffer() {
vfb->fbo = fbo_create(vfb->renderWidth, vfb->renderHeight, 1, true, vfb->colorDepth); vfb->fbo = fbo_create(vfb->renderWidth, vfb->renderHeight, 1, true, vfb->colorDepth);
if (vfb->fbo) { if (vfb->fbo) {
fbo_bind_as_render_target(vfb->fbo); fbo_bind_as_render_target(vfb->fbo);
if (destroyVfb) {
// Copy over the contents of the framebuffer we're replacing.
BlitFramebuffer_(vfb, 0, 0, destroyVfb, 0, 0, vfb->width, vfb->height, 0);
fbo_bind_as_render_target(vfb->fbo);
}
} else { } else {
ERROR_LOG(SCEGE, "Error creating FBO! %i x %i", vfb->renderWidth, vfb->renderHeight); ERROR_LOG(SCEGE, "Error creating FBO! %i x %i", vfb->renderWidth, vfb->renderHeight);
} }
@ -893,14 +887,24 @@ void FramebufferManager::DoSetRenderFrameBuffer() {
} }
if (destroyVfb) { if (destroyVfb) {
if (vfb->fbo) {
// Copy over the contents of the framebuffer we're replacing.
BlitFramebuffer_(vfb, 0, 0, destroyVfb, 0, 0, std::min(vfb->bufferWidth, vfb->width), std::min(vfb->height, vfb->bufferHeight), 0);
}
// Do this before notifying of creation at the same address. // Do this before notifying of creation at the same address.
DestroyFramebuf(destroyVfb); DestroyFramebuf(destroyVfb);
destroyVfb = 0; destroyVfb = 0;
vfbs_.erase(vfbs_.begin() + i); vfbs_.erase(vfbs_.begin() + i);
fbo_bind_as_render_target(vfb->fbo);
if (!useBufferedRendering_) {
ClearBuffer();
}
INFO_LOG(SCEGE, "Resizing FBO for %08x : %i x %i x %i", vfb->fb_address, vfb->width, vfb->height, vfb->format); INFO_LOG(SCEGE, "Resizing FBO for %08x : %i x %i x %i", vfb->fb_address, vfb->width, vfb->height, vfb->format);
} else { } else {
INFO_LOG(SCEGE, "Creating FBO for %08x : %i x %i x %i", vfb->fb_address, vfb->width, vfb->height, vfb->format); INFO_LOG(SCEGE, "Creating FBO for %08x : %i x %i x %i", vfb->fb_address, vfb->width, vfb->height, vfb->format);
ClearBuffer();
} }
textureCache_->NotifyFramebuffer(vfb->fb_address, vfb, NOTIFY_FB_CREATED); textureCache_->NotifyFramebuffer(vfb->fb_address, vfb, NOTIFY_FB_CREATED);
@ -908,7 +912,6 @@ void FramebufferManager::DoSetRenderFrameBuffer() {
vfb->last_frame_render = gpuStats.numFlips; vfb->last_frame_render = gpuStats.numFlips;
frameLastFramebufUsed = gpuStats.numFlips; frameLastFramebufUsed = gpuStats.numFlips;
vfbs_.push_back(vfb); vfbs_.push_back(vfb);
ClearBuffer();
glEnable(GL_DITHER); // why? glEnable(GL_DITHER); // why?
currentRenderVfb_ = vfb; currentRenderVfb_ = vfb;