Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "EGL: move disconnect to surface dtor"

Browse Source
This commit is contained in:
Jamie Gennis
2011-08-25 13:48:25 -07:00
committed by Android (Google) Code Review
parent 8e7e95f22f 7de41f1bf7
commit c63764e834
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,13 +454,6 @@ EGLBoolean eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
EGLBoolean result = s->cnx->egl.eglDestroySurface(
dp->disp[s->impl].dpy, s->surface);
if (result == EGL_TRUE) {
ANativeWindow* const window = s->win.get();
if (window != NULL) {
native_window_set_buffers_format(window, 0);
if (native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL)) {
LOGE("EGLNativeWindowType %p disconnected failed", window);
}
}
_s.terminate();
}
return result;

11
opengl/libs/EGL/egl_object.h
View File

@@ -125,7 +125,15 @@ void egl_object_t::LocalRef<N,T>::terminate() {
class egl_surface_t: public egl_object_t {
protected:
~egl_surface_t() {}
~egl_surface_t() {
ANativeWindow* const window = win.get();
if (window != NULL) {
native_window_set_buffers_format(window, 0);
if (native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL)) {
LOGE("EGLNativeWindowType %p disconnected failed", window);
}
}
}
public:
typedef egl_object_t::LocalRef<egl_surface_t, EGLSurface> Ref;
@@ -232,4 +240,3 @@ egl_sync_t* get_sync(EGLSyncKHR sync) {
// ----------------------------------------------------------------------------
#endif // ANDROID_EGL_OBJECT_H