diff options
| author | Lajos Molnar <lajos@google.com> | 2013-06-28 00:42:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-28 00:42:23 +0000 |
| commit | 23e81a2103b08fa14f208fec1d1e2e16347f8b2f (patch) | |
| tree | 4ab07fcbe1dc9d5added9ddf3867c230a76dd24a | |
| parent | 02bea9786d2ecc4c04f35fd7d9b73d4dd2b73735 (diff) | |
| parent | 98d3d6ec1250248574f2e8d72e5c934fecbcd734 (diff) | |
| download | frameworks_native-23e81a2103b08fa14f208fec1d1e2e16347f8b2f.zip frameworks_native-23e81a2103b08fa14f208fec1d1e2e16347f8b2f.tar.gz frameworks_native-23e81a2103b08fa14f208fec1d1e2e16347f8b2f.tar.bz2 | |
Merge "SurfaceFlinger: fix releaseBuffer in updateTexImage"
| -rw-r--r-- | services/surfaceflinger/SurfaceFlingerConsumer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.cpp b/services/surfaceflinger/SurfaceFlingerConsumer.cpp index 6912dc0..7ac5c60 100644 --- a/services/surfaceflinger/SurfaceFlingerConsumer.cpp +++ b/services/surfaceflinger/SurfaceFlingerConsumer.cpp @@ -69,7 +69,7 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter) // reject buffers which have the wrong size int buf = item.mBuf; if (rejecter && rejecter->reject(mSlots[buf].mGraphicBuffer, item)) { - releaseBufferLocked(buf, item.mGraphicBuffer, EGL_NO_SYNC_KHR); + releaseBufferLocked(buf, mSlots[buf].mGraphicBuffer, EGL_NO_SYNC_KHR); return NO_ERROR; } |