diff options
author | Mathias Agopian <mathias@google.com> | 2010-01-21 16:27:30 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-01-21 16:27:30 -0800 |
commit | 8c3b597aa7a627ab6979e58a173502cc505cb0df (patch) | |
tree | 8bcb212e089d8641060c242710ef7fbc581fe46b /libs | |
parent | aa774c3e81d9ab685461ca0ab368086f669e4d1f (diff) | |
download | frameworks_native-8c3b597aa7a627ab6979e58a173502cc505cb0df.zip frameworks_native-8c3b597aa7a627ab6979e58a173502cc505cb0df.tar.gz frameworks_native-8c3b597aa7a627ab6979e58a173502cc505cb0df.tar.bz2 |
fix a texture leak introduced recently.
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 091856f..b9727ab 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -444,6 +444,10 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const NativeBuffer src(ourBuffer->getBuffer()); const Rect transformedBounds(mLayer.getTransformedBounds()); + if (UNLIKELY(mTexture.name == -1LU)) { + mTexture.name = mLayer.createTexture(); + } + #if defined(EGL_ANDROID_image_native_buffer) if (mLayer.mFlags & DisplayHardware::DIRECT_TEXTURE) { copybit_device_t* copybit = mLayer.mBlitEngine; @@ -483,9 +487,6 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const t.format = src.img.format; t.data = (GGLubyte*)src.img.base; const Region dirty(Rect(t.width, t.height)); - if (UNLIKELY(mTexture.name == -1LU)) { - mTexture.name = mLayer.createTexture(); - } mLayer.loadTexture(&mTexture, dirty, t); } @@ -566,11 +567,17 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const void LayerBuffer::BufferSource::clearTempBufferImage() const { + // delete the image EGLDisplay dpy(mLayer.mFlinger->graphicPlane(0).getEGLDisplay()); - glDeleteTextures(1, &mTexture.name); eglDestroyImageKHR(dpy, mTexture.image); + + // and the associated texture (recreate a name) + glDeleteTextures(1, &mTexture.name); Texture defaultTexture; mTexture = defaultTexture; + mTexture.name = mLayer.createTexture(); + + // and the associated buffer mTempGraphicBuffer.clear(); } |