diff options
| author | Mathias Agopian <mathias@google.com> | 2012-06-13 16:27:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-13 16:27:54 -0700 |
| commit | fe6102f07cc3fa8cfa2283e2c51e6d19f056ee7c (patch) | |
| tree | f2196e8544afc73031fefc7e45777dc4b0b79f9d /opengl | |
| parent | 4b3e4ae04577d4fcce0aac40bfba4043c34047f6 (diff) | |
| parent | fe98127eaaf82686ba750001e2b771abece44e97 (diff) | |
| download | frameworks_native-fe6102f07cc3fa8cfa2283e2c51e6d19f056ee7c.zip frameworks_native-fe6102f07cc3fa8cfa2283e2c51e6d19f056ee7c.tar.gz frameworks_native-fe6102f07cc3fa8cfa2283e2c51e6d19f056ee7c.tar.bz2 | |
Merge "don't error out when eglTerminate()ing an already terminated display"
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index a46aa38..80072ab 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -263,7 +263,13 @@ EGLBoolean egl_display_t::terminate() { Mutex::Autolock _l(lock); if (refs == 0) { - return setError(EGL_NOT_INITIALIZED, EGL_FALSE); + /* + * From the EGL spec (3.2): + * "Termination of a display that has already been terminated, + * (...), is allowed, but the only effect of such a call is + * to return EGL_TRUE (...) + */ + return EGL_TRUE; } // this is specific to Android, display termination is ref-counted. |