Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent cc6b941cf0 9d5fac5174
commit d01ce1924a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opengl/libs/EGL/egl.cpp
View File

@@ -1344,16 +1344,18 @@ EGLBoolean eglWaitNative(EGLint engine)
EGLint eglGetError(void) EGLint eglGetError(void)
{ {
EGLint result = EGL_SUCCESS; EGLint result = EGL_SUCCESS;
EGLint err;
for (int i=0 ; i<IMPL_NUM_IMPLEMENTATIONS ; i++) { for (int i=0 ; i<IMPL_NUM_IMPLEMENTATIONS ; i++) {
EGLint err = EGL_SUCCESS; err = EGL_SUCCESS;
egl_connection_t* const cnx = &gEGLImpl[i]; egl_connection_t* const cnx = &gEGLImpl[i];
if (cnx->dso) if (cnx->dso)
err = cnx->egl.eglGetError(); err = cnx->egl.eglGetError();
if (err!=EGL_SUCCESS && result==EGL_SUCCESS) if (err!=EGL_SUCCESS && result==EGL_SUCCESS)
result = err; result = err;
} }
err = getError();
if (result == EGL_SUCCESS) if (result == EGL_SUCCESS)
result = getError(); result = err;
return result; return result;
} }