Revert "[RenderEngine] Rebind output texture when unbinding framebuffer"
This reverts commit d9c717511c46eefa78821a7e326bffde4f02076b.
Reason for revert: Short-term, to unblock emulator users due to
blank app drawer/recents: https://b.corp.google.com/issues/154665573
Bug: b/140158384
Change-Id: Ie3c6500b31eada4bf831ecef1a69c079db4cc61f
diff --git a/libs/renderengine/gl/GLESRenderEngine.cpp b/libs/renderengine/gl/GLESRenderEngine.cpp
index df711d2..da87092 100644
--- a/libs/renderengine/gl/GLESRenderEngine.cpp
+++ b/libs/renderengine/gl/GLESRenderEngine.cpp
@@ -897,32 +897,13 @@
return glStatus == GL_FRAMEBUFFER_COMPLETE_OES ? NO_ERROR : BAD_VALUE;
}
-void GLESRenderEngine::unbindFrameBuffer(Framebuffer* /*framebuffer*/) {
+void GLESRenderEngine::unbindFrameBuffer(Framebuffer* /* framebuffer */) {
ATRACE_CALL();
// back to main framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
-bool GLESRenderEngine::cleanupPostRender() {
- ATRACE_CALL();
-
- if (mPriorResourcesCleaned ||
- (mLastDrawFence != nullptr && mLastDrawFence->getStatus() != Fence::Status::Signaled)) {
- // If we don't have a prior frame needing cleanup, then don't do anything.
- return false;
- }
-
- // Bind the texture to dummy data so that backing image data can be freed.
- GLFramebuffer* glFramebuffer = static_cast<GLFramebuffer*>(getFramebufferForDrawing());
- glFramebuffer->allocateBuffers(1, 1, mPlaceholderDrawBuffer);
- // Release the cached fence here, so that we don't churn reallocations when
- // we could no-op repeated calls of this method instead.
- mLastDrawFence = nullptr;
- mPriorResourcesCleaned = true;
- return true;
-}
-
void GLESRenderEngine::checkErrors() const {
checkErrors(nullptr);
}
@@ -1212,13 +1193,7 @@
// us bad parameters, or we messed up our shader generation).
return INVALID_OPERATION;
}
- mLastDrawFence = nullptr;
- } else {
- // The caller takes ownership of drawFence, so we need to duplicate the
- // fd here.
- mLastDrawFence = new Fence(dup(drawFence->get()));
}
- mPriorResourcesCleaned = false;
checkErrors();
return NO_ERROR;