diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
| commit | b86e8562b1ddca2a8bc29f22a79451a041bf5293 (patch) | |
| tree | 60fead0638fce6922b4043767fa991ff1f0e3488 /mesalib/src/mesa/main/syncobj.c | |
| parent | 53192e17e55aa9ed3e3721bf4fdcb2b01a595202 (diff) | |
| download | vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.gz vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.bz2 vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.zip | |
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index e1a5c6c0f..9f5a27e62 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -326,9 +326,13 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) if (syncObj->StatusFlag) { ret = GL_ALREADY_SIGNALED; } else { - ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout); + if (timeout == 0) { + ret = GL_TIMEOUT_EXPIRED; + } else { + ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout); - ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED; + ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED; + } } _mesa_unref_sync_object(ctx, syncObj); |