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

Commit d01ce192 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread 

Merge commit '9d5fac51' into gingerbread-plus-aosp

* commit '9d5fac51':
  fix small bug in EGL error management
parents cc6b941c 9d5fac51

opengl/libs/EGL/egl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1344,16 +1344,18 @@ EGLBoolean eglWaitNative(EGLint engine) 
EGLint eglGetError(void)

{

    EGLint result = EGL_SUCCESS;

    EGLint err;

    for (int i=0 ; i<IMPL_NUM_IMPLEMENTATIONS ; i++) {

        EGLint err = EGL_SUCCESS;

        err = EGL_SUCCESS;

        egl_connection_t* const cnx = &gEGLImpl[i];

        if (cnx->dso)

            err = cnx->egl.eglGetError();

        if (err!=EGL_SUCCESS && result==EGL_SUCCESS)

            result = err;

    }

    err = getError();

    if (result == EGL_SUCCESS)

        result = getError();

        result = err;

    return result;

}