summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-03-16 16:01:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-16 16:01:31 -0700
commit9405d98705db1c8102b77ef960f344ac416d165c (patch)
treec01658119db90ebfc9aa9537ac9aa7c8d8f35616
parent1cbf8493dae7f8aed3e562a05d8d311f98c141b9 (diff)
parenta05a8ac5eef083a4c28c1fb4eceea92100cf86a2 (diff)
am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
* commit 'a05a8ac5eef083a4c28c1fb4eceea92100cf86a2': fix [4107131] nvidia driver call takes a very long time
-rw-r--r--opengl/libs/EGL/egl.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index f4a16509ed28..e13af1ca24aa 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -2077,14 +2077,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)