Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix EGLImage memory leak" into nyc-mr1-dev

Browse Source
This commit is contained in:
John Reck
2016-09-02 15:07:23 +00:00
committed by Android (Google) Code Review
parent bdb81a0a7f f8b0360298
commit 02913603bd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/Readback.cpp
View File

@@ -136,7 +136,7 @@ CopyResult Readback::copySurfaceInto(renderthread::RenderThread& renderThread,
EGL_NATIVE_BUFFER_ANDROID, clientBuffer, attrs); EGL_NATIVE_BUFFER_ANDROID, clientBuffer, attrs);
if (sourceImage == EGL_NO_IMAGE_KHR) { if (sourceImage == EGL_NO_IMAGE_KHR) {
ALOGW("Error creating image (%#x)", eglGetError()); ALOGW("eglCreateImageKHR failed (%#x)", eglGetError());
return CopyResult::UnknownError; return CopyResult::UnknownError;
} }
GLuint sourceTexId; GLuint sourceTexId;
@@ -147,7 +147,8 @@ CopyResult Readback::copySurfaceInto(renderthread::RenderThread& renderThread,
GLenum status = GL_NO_ERROR; GLenum status = GL_NO_ERROR;
while ((status = glGetError()) != GL_NO_ERROR) { while ((status = glGetError()) != GL_NO_ERROR) {
ALOGW("Error creating image (%#x)", status); ALOGW("glEGLImageTargetTexture2DOES failed (%#x)", status);
eglDestroyImageKHR(display, sourceImage);
return CopyResult::UnknownError; return CopyResult::UnknownError;
} }
@@ -183,6 +184,13 @@ CopyResult Readback::copySurfaceInto(renderthread::RenderThread& renderThread,
caches.textureState().deleteTexture(texture); caches.textureState().deleteTexture(texture);
renderState.deleteFramebuffer(fbo); renderState.deleteFramebuffer(fbo);
sourceTexture.deleteTexture();
// All we're flushing & finishing is the deletion of the texture since
// copyTextureInto already did a major flush & finish as an implicit
// part of glReadPixels, so this shouldn't pose any major stalls.
glFinish();
eglDestroyImageKHR(display, sourceImage);
GL_CHECKPOINT(MODERATE); GL_CHECKPOINT(MODERATE);
return CopyResult::Success; return CopyResult::Success;