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

Commit 8a715c64 authored by Michael Lentine's avatar Michael Lentine Committed by The Android Automerger
Browse files

Revert "Modify EGL to disconnect the window when the surface gets destroyed." 

This reverts commit 00699fa6.
parent f7ac9a3b

libs/gui/BufferQueueProducer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -914,8 +914,8 @@ status_t BufferQueueProducer::disconnect(int api) { 
                    mCore->mSidebandStream.clear();

                    mCore->mDequeueCondition.broadcast();

                    listener = mCore->mConsumerListener;

                } else if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) {

                    BQ_LOGE("disconnect(P): still connected to another API "

                } else {

                    BQ_LOGE("disconnect(P): connected to another API "

                            "(cur=%d req=%d)", mCore->mConnectedApi, api);

                    status = BAD_VALUE;

                }

opengl/libs/EGL/eglApi.cpp

+0 −9
Original line number Diff line number Diff line
@@ -562,15 +562,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();