diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-01-31 15:40:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 15:40:06 -0800 |
| commit | f27bbc238cb53f51186ca04f69810cda61664f9a (patch) | |
| tree | 233c758a3d783be9e14bd82f939b2565958da9fa /opengl | |
| parent | c999a4ca96ec72c03f913a93a097ccc8afed0a6a (diff) | |
| parent | e3b179c732fde81da0bffecd9579cafd727b3417 (diff) | |
| download | frameworks_base-f27bbc238cb53f51186ca04f69810cda61664f9a.zip frameworks_base-f27bbc238cb53f51186ca04f69810cda61664f9a.tar.gz frameworks_base-f27bbc238cb53f51186ca04f69810cda61664f9a.tar.bz2 | |
Merge "Clear all EGL errors when entering EGL funcs."
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 8977fbf..3dc8c03 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -389,10 +389,9 @@ static tls_t* getTLS() } static inline void clearError() { - if (gEGLThreadLocalStorageKey != -1) { - tls_t* tls = getTLS(); - tls->error = EGL_SUCCESS; - } + // This must clear the error from all the underlying EGL implementations as + // well as the EGL wrapper layer. + eglGetError(); } template<typename T> |