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

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

* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
  fix small bug in EGL error management
This commit is contained in:
Mathias Agopian 2010-09-22 14:21:01 -07:00 committed by Android Git Automerger
commit d7a0841a19

View File

@ -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;
}