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

Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""

Browse Source 
This reverts commit 6e1a2fea67.

Driver level issues fixed by an updated graphics driver.

Bug: 21266976
Change-Id: I93339fb6c6bab988f3550adb49ef8e70cda6473e
This commit is contained in:
Amith Dsouza 2015-06-30 22:54:16 -07:00
parent fe608c5e3c
commit 4f21a4cc22
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

@ -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;
}

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);
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();