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 | 5e4059f646a6c648b000d1422180bd85d93c09a9 (patch) | |
| tree | 43db4cbb0eca2222ad87dac07679ae68b85d909b /opengl/libs/EGL/egl.cpp | |
| parent | 93668dfdd6d66ec390c94f9959088ac46ed21850 (diff) | |
| parent | 9405d98705db1c8102b77ef960f344ac416d165c (diff) | |
| download | frameworks_base-5e4059f646a6c648b000d1422180bd85d93c09a9.zip frameworks_base-5e4059f646a6c648b000d1422180bd85d93c09a9.tar.gz frameworks_base-5e4059f646a6c648b000d1422180bd85d93c09a9.tar.bz2 | |
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/libs/EGL/egl.cpp')
| -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 7ce86b3..e567c88 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) |