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

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

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

Merge commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124'

* commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124':
  fix small bug in EGL error management
parents 0f28d61d d7a0841a

opengl/libs/EGL/egl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1365,16 +1365,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;

}