diff options
| author | Michael Lentine <mlentine@google.com> | 2014-07-23 10:19:41 -0700 |
|---|---|---|
| committer | Michael Lentine <mlentine@google.com> | 2015-05-13 15:41:41 -0700 |
| commit | 00699fa64197cc72a160d69e1f0003cdd43dc136 (patch) | |
| tree | 36600fc94d119d85759af3835ab9f2d05c99bdf2 | |
| parent | be451b57b97c21747c637f4af06743318d42c36c (diff) | |
| download | frameworks_native-00699fa64197cc72a160d69e1f0003cdd43dc136.tar.gz frameworks_native-00699fa64197cc72a160d69e1f0003cdd43dc136.tar.bz2 frameworks_native-00699fa64197cc72a160d69e1f0003cdd43dc136.zip | |
Modify EGL to disconnect the window when the surface gets destroyed.
Bug: 14445579
Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
| -rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 4 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index 7251d369a..a4dffff33 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -913,8 +913,8 @@ status_t BufferQueueProducer::disconnect(int api) { mCore->mSidebandStream.clear(); mCore->mDequeueCondition.broadcast(); listener = mCore->mConsumerListener; - } else { - BQ_LOGE("disconnect(P): connected to another API " + } else if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) { + BQ_LOGE("disconnect(P): still connected to another API " "(cur=%d req=%d)", mCore->mConnectedApi, api); status = BAD_VALUE; } diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index f5b90dd84..f4e46e2ee 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -561,6 +561,15 @@ EGLBoolean eglDestroySurface(EGLDisplay dpy, EGLSurface surface) return setError(EGL_BAD_SURFACE, EGL_FALSE); egl_surface_t * const s = get_surface(surface); + ANativeWindow* window = s->win.get(); + if (window) { + int result = native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL); + if (result != OK) { + ALOGE("eglDestroySurface: native_window_api_disconnect (win=%p) " + "failed (%#x)", + window, result); + } + } EGLBoolean result = s->cnx->egl.eglDestroySurface(dp->disp.dpy, s->surface); if (result == EGL_TRUE) { _s.terminate(); |