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

Commit f345c1f4 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

resolve merge conflicts of 75b79d3f to stage-aosp-master am: 21f67731 

am: 93ce78f6

Change-Id: Iae2e888a92bb75b87790069246368625b2931af8
parents 5d795e95 93ce78f6

opengl/libs/EGL/eglApi.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -1324,13 +1324,14 @@ EGLBoolean eglReleaseThread(void) 
{

{

    clearError();

    clearError();





    // If there is context bound to the thread, release it

    egl_display_t::loseCurrent(get_context(getContext()));



    egl_connection_t* const cnx = &gEGLImpl;

    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->dso && cnx->egl.eglReleaseThread) {

    if (cnx->dso && cnx->egl.eglReleaseThread) {

        cnx->egl.eglReleaseThread();

        cnx->egl.eglReleaseThread();

    }

    }



    // If there is context bound to the thread, release it

    egl_display_t::loseCurrent(get_context(getContext()));



    egl_tls_t::clearTLS();

    egl_tls_t::clearTLS();

    return EGL_TRUE;

    return EGL_TRUE;

}

}