summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-06-05 17:40:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-05 17:40:23 +0000
commit6fa25f9d8fa003a6fb694bf8b09f1c5f316034b9 (patch)
tree743be96796a8c2ecbb02d3d5226a7d6bfc3722d0
parent4f80b867b3433ddc16d416809c7e9cd5d6deb88b (diff)
parenta277ccba0781c07b73afda203fcaabd46104b49d (diff)
downloadnative-6fa25f9d8fa003a6fb694bf8b09f1c5f316034b9.tar.gz
Merge "SF: Add workaround to release screenshot buffer" into pi-dev
-rw-r--r--services/surfaceflinger/RenderEngine/RenderEngine.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index 4c878aee31..c2233f9b59 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -427,6 +427,12 @@ void RenderEngine::unbindNativeBufferAsFrameBuffer(RE::BindNativeBufferAsFramebu
// back to main framebuffer
unbindFramebuffer(bindHelper->mTexName, bindHelper->mFbName);
eglDestroyImageKHR(mEGLDisplay, bindHelper->mImage);
+
+ // Workaround for b/77935566 to force the EGL driver to release the
+ // screenshot buffer
+ setScissor(0, 0, 0, 0);
+ clearWithColor(0.0, 0.0, 0.0, 0.0);
+ disableScissor();
}
// ---------------------------------------------------------------------------