summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2014-07-23 10:19:41 -0700
committerMichael Lentine <mlentine@google.com>2014-07-29 18:59:56 -0700
commit843cbb241da60ada234918a30cfe9a01a1e04187 (patch)
tree9a4dc006fc5dfc068e7347bc41537b7f9df78cd1 /opengl
parent119b765a053f650b4b47256245ce836f8c403d7f (diff)
downloadframeworks_native-843cbb241da60ada234918a30cfe9a01a1e04187.zip
frameworks_native-843cbb241da60ada234918a30cfe9a01a1e04187.tar.gz
frameworks_native-843cbb241da60ada234918a30cfe9a01a1e04187.tar.bz2
Modify EGL to disconnect the window when the surface gets destroyed.
Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libs/EGL/eglApi.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 6e77e45..99c01b7 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -572,6 +572,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();