Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a518d5ad authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface 

* commit '312d7555':
  egl: Remove window disconnect before calling driver eglDestroySurface
parents 76fc5f18 312d7555

opengl/libs/EGL/eglApi.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -595,15 +595,6 @@ EGLBoolean eglDestroySurface(EGLDisplay dpy, EGLSurface surface) 
        return setError(EGL_BAD_SURFACE, EGL_FALSE);

        return setError(EGL_BAD_SURFACE, EGL_FALSE);





    egl_surface_t * const s = get_surface(surface);

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

    EGLBoolean result = s->cnx->egl.eglDestroySurface(dp->disp.dpy, s->surface);

    if (result == EGL_TRUE) {

    if (result == EGL_TRUE) {

        _s.terminate();

        _s.terminate();