diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
| commit | 4951bcc16e99daafc44581e4222f012f9d419ae0 (patch) | |
| tree | 7be00878227a20b4610649a7d455db2d9cb3463c /opengl | |
| parent | 53602ffde5527c476a1d7d39da12ecd7f58917f4 (diff) | |
| parent | a78c2e65e13cace4fdbb0295beca5b11de9fde06 (diff) | |
| download | frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.zip frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.gz frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3
Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 0bc81b1..4d9eaf5 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -604,15 +604,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(); |