diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-22 14:41:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 14:41:45 -0700 |
| commit | 50804e0cb27e66c3fa906e127f7f39c148219d7c (patch) | |
| tree | cab43c721d35b46c67abe6b44d62b389eecb6c76 /opengl/libs/EGL/egl.cpp | |
| parent | 353a48e8ed90c028fb51fe145dae6113661f03e4 (diff) | |
| parent | d01ce1924a51539c4d47ef1f55913bdf1a018124 (diff) | |
| download | frameworks_base-50804e0cb27e66c3fa906e127f7f39c148219d7c.zip frameworks_base-50804e0cb27e66c3fa906e127f7f39c148219d7c.tar.gz frameworks_base-50804e0cb27e66c3fa906e127f7f39c148219d7c.tar.bz2 | |
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
Diffstat (limited to 'opengl/libs/EGL/egl.cpp')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 2f4d5db..a8200be 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -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; } |