diff options
| author | Michael Lentine <mlentine@google.com> | 2015-05-28 16:48:08 -0700 |
|---|---|---|
| committer | Michael Lentine <mlentine@google.com> | 2015-05-28 16:48:08 -0700 |
| commit | 6e1a2fea67006b58e83ebbcc72f7b12f18c49d15 (patch) | |
| tree | 8f9191e29da543f14ca61da1a779e2aa6eca29f6 | |
| parent | 89301eaf214f0da74c5266e7a548899d5f491b50 (diff) | |
| download | frameworks_native-6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.zip frameworks_native-6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.tar.gz frameworks_native-6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.tar.bz2 | |
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
This reverts commit 00699fa64197cc72a160d69e1f0003cdd43dc136.
| -rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 4 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index 2cf7433..e318484 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -914,8 +914,8 @@ status_t BufferQueueProducer::disconnect(int api) { mCore->mSidebandStream.clear(); mCore->mDequeueCondition.broadcast(); listener = mCore->mConsumerListener; - } else if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) { - BQ_LOGE("disconnect(P): still connected to another API " + } else { + BQ_LOGE("disconnect(P): 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 8dd052c..5444631 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -562,15 +562,6 @@ 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(); |