diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-12 11:54:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 11:54:52 -0700 |
| commit | a0931d657551f5098f805fbdeeed2b060bbe6171 (patch) | |
| tree | 5ea3b4b0510050fdf270a71f19d75bf5409702f4 /libs | |
| parent | 92def36f9f79973c6ca18fc66210b32e3901351d (diff) | |
| parent | 98ff0597bd9e57ba133d54f8f09841f96955cba1 (diff) | |
| download | frameworks_native-a0931d657551f5098f805fbdeeed2b060bbe6171.zip frameworks_native-a0931d657551f5098f805fbdeeed2b060bbe6171.tar.gz frameworks_native-a0931d657551f5098f805fbdeeed2b060bbe6171.tar.bz2 | |
Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index e21b65d..36a2af7 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -478,6 +478,7 @@ status_t SurfaceTexture::syncForReleaseLocked(EGLDisplay dpy) { } glFlush(); int fenceFd = eglDupNativeFenceFDANDROID(dpy, sync); + eglDestroySyncKHR(dpy, sync); if (fenceFd == EGL_NO_NATIVE_FENCE_FD_ANDROID) { ST_LOGE("syncForReleaseLocked: error dup'ing native fence " "fd: %#x", eglGetError()); |