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

Commit 93ce78f6 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

Change-Id: I8d823ce09258b4b6ee1ec9dece8a46794d6fe87a
parents 528378d4 21f67731

opengl/libs/EGL/eglApi.cpp

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

    clearError();



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

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



    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->dso && 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();

    return EGL_TRUE;

}