diff options
| author | Mathias Agopian <mathias@google.com> | 2011-03-16 16:03:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 16:03:24 -0700 |
| commit | 7d7723d330f544d1e3882b2a360a6e8b6b70e02a (patch) | |
| tree | 82aa4b816e1e92f3199e438728c6864998646dec /opengl | |
| parent | 5c2610eb498195349f28f9659a590303b7c591c0 (diff) | |
| parent | c33924df425082bc6b8b06c9a0429c236e69001b (diff) | |
| download | frameworks_native-7d7723d330f544d1e3882b2a360a6e8b6b70e02a.tar.gz frameworks_native-7d7723d330f544d1e3882b2a360a6e8b6b70e02a.tar.bz2 frameworks_native-7d7723d330f544d1e3882b2a360a6e8b6b70e02a.zip | |
am 9405d987: am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
* commit '9405d98705db1c8102b77ef960f344ac416d165c':
fix [4107131] nvidia driver call takes a very long time
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 7ce86b373..e567c8860 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -2119,14 +2119,15 @@ EGLBoolean eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync) if (!validate_display_context(dpy, ctx)) return EGL_FALSE; + EGLBoolean result = EGL_FALSE; egl_context_t * const c = get_context(ctx); - if (c->cnx->egl.eglDestroySyncKHR) { - return c->cnx->egl.eglDestroySyncKHR( + result = c->cnx->egl.eglDestroySyncKHR( dp->disp[c->impl].dpy, syncObject->sync); + if (result) + _s.terminate(); } - - return EGL_FALSE; + return result; } EGLint eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) |