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 | 8446681ebebc874b52645b6fdcd8e5b485e29f6b (patch) | |
| tree | ba9955a087c42585f30f035fb02ec31be2051f16 /opengl | |
| parent | 30faa241e2949f650e5ea044e36e9f3e437ea0d9 (diff) | |
| parent | f1cde8e0ed019791641bd07c5c1f965b0f8cf7c5 (diff) | |
| download | frameworks_native-8446681ebebc874b52645b6fdcd8e5b485e29f6b.tar.gz frameworks_native-8446681ebebc874b52645b6fdcd8e5b485e29f6b.tar.bz2 frameworks_native-8446681ebebc874b52645b6fdcd8e5b485e29f6b.zip | |
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 8977fbf5e..3dc8c03fa 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> |