summaryrefslogtreecommitdiffstats
path: root/opengl/libs
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2014-08-08 17:42:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-08 17:42:02 +0000
commit0ffbac894c4f72a04792aa3a66d058f774fcdf37 (patch)
tree206616d8cab2ebaf85296769f557bf1644f32e6d /opengl/libs
parent60c66099c06985de5ad27ac2bccd5e9ae0802689 (diff)
parent45e2fc22261cb8ecac4901b4425bcb7352c71174 (diff)
downloadframeworks_native-0ffbac894c4f72a04792aa3a66d058f774fcdf37.zip
frameworks_native-0ffbac894c4f72a04792aa3a66d058f774fcdf37.tar.gz
frameworks_native-0ffbac894c4f72a04792aa3a66d058f774fcdf37.tar.bz2
am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '45e2fc22261cb8ecac4901b4425bcb7352c71174': Revert "Modify EGL to disconnect the window when the surface gets destroyed."
Diffstat (limited to 'opengl/libs')
-rw-r--r--opengl/libs/EGL/eglApi.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 99c01b7..6e77e45 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -572,15 +572,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();