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
This commit is contained in:
Mathias Agopian 2011-03-16 16:01:31 -07:00 committed by Android Git Automerger
commit c33924df42

View File

@ -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)