ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Modify EGL to disconnect the window when the surface gets destroyed." into mnc-dev

Browse Source
This commit is contained in:
Michael Lentine 2015-05-14 16:39:27 +00:00 committed by Android (Google) Code Review
commit 51c8c502f6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/BufferQueueProducer.cpp
View File

@ -914,8 +914,8 @@ status_t BufferQueueProducer::disconnect(int api) {
mCore->mSidebandStream.clear(); mCore->mSidebandStream.clear();
mCore->mDequeueCondition.broadcast(); mCore->mDequeueCondition.broadcast();
listener = mCore->mConsumerListener; listener = mCore->mConsumerListener;
} else { } else if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) {
BQ_LOGE("disconnect(P): connected to another API " BQ_LOGE("disconnect(P): still connected to another API "
"(cur=%d req=%d)", mCore->mConnectedApi, api); "(cur=%d req=%d)", mCore->mConnectedApi, api);
status = BAD_VALUE; status = BAD_VALUE;
} }

9
opengl/libs/EGL/eglApi.cpp
View File

@ -562,6 +562,15 @@ EGLBoolean eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
return setError(EGL_BAD_SURFACE, EGL_FALSE); return setError(EGL_BAD_SURFACE, EGL_FALSE);
egl_surface_t * const s = get_surface(surface); 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); EGLBoolean result = s->cnx->egl.eglDestroySurface(dp->disp.dpy, s->surface);
if (result == EGL_TRUE) { if (result == EGL_TRUE) {
_s.terminate(); _s.terminate();