Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1

Browse Source 
* 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
parent 1cbf8493da a05a8ac5ee
commit 9405d98705
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opengl/libs/EGL/egl.cpp
View File

@@ -2077,14 +2077,15 @@ EGLBoolean eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync)
if (!validate_display_context(dpy, ctx)) if (!validate_display_context(dpy, ctx))
return EGL_FALSE; return EGL_FALSE;
EGLBoolean result = EGL_FALSE;
egl_context_t * const c = get_context(ctx); egl_context_t * const c = get_context(ctx);
if (c->cnx->egl.eglDestroySyncKHR) { if (c->cnx->egl.eglDestroySyncKHR) {
return c->cnx->egl.eglDestroySyncKHR( result = c->cnx->egl.eglDestroySyncKHR(
dp->disp[c->impl].dpy, syncObject->sync); dp->disp[c->impl].dpy, syncObject->sync);
if (result)
_s.terminate();
} }
return result;
return EGL_FALSE;
} }
EGLint eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) EGLint eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout)