diff options
| author | Amith Dsouza <amithds@google.com> | 2015-06-30 22:54:16 -0700 |
|---|---|---|
| committer | Amith Dsouza <amithds@google.com> | 2015-07-01 10:22:22 -0700 |
| commit | 4f21a4cc22a94eeb65742fcbb0a8516624474fe5 (patch) | |
| tree | 217ba3838b5bad8e89ba66cf63104e82ffa7bc73 | |
| parent | fe608c5e3c75714e4aa6c31e048f4a15e4951411 (diff) | |
| download | frameworks_native-4f21a4cc22a94eeb65742fcbb0a8516624474fe5.zip frameworks_native-4f21a4cc22a94eeb65742fcbb0a8516624474fe5.tar.gz frameworks_native-4f21a4cc22a94eeb65742fcbb0a8516624474fe5.tar.bz2 | |
Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
This reverts commit 6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.
Driver level issues fixed by an updated graphics driver.
Bug: 21266976
Change-Id: I93339fb6c6bab988f3550adb49ef8e70cda6473e
| -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 38fb757..87e5b4d 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -922,8 +922,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 5444631..8dd052c 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -562,6 +562,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(); |