diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-21 15:43:59 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-09-21 15:43:59 -0700 |
| commit | 02dafb5068be31cc45af897a8bd1cae8f4724401 (patch) | |
| tree | 5c576cfe4461c2651a9a6cf01138114e9abf1815 /opengl | |
| parent | a59fba9eacabfb29acc9ad7dbd3672c60fa883a1 (diff) | |
| download | frameworks_native-02dafb5068be31cc45af897a8bd1cae8f4724401.zip frameworks_native-02dafb5068be31cc45af897a8bd1cae8f4724401.tar.gz frameworks_native-02dafb5068be31cc45af897a8bd1cae8f4724401.tar.bz2 | |
fix small bug in EGL error management
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation
Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
Diffstat (limited to 'opengl')
| -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 df21358..105ebb4 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -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; } |