diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
| commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
| tree | 221ee6420074033279921fadc971d30d63d6847b /mesalib/src/mesa/main/syncobj.c | |
| parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
| download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip | |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index 1d178950c..745e982ad 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -308,7 +308,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) { - _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags); + _mesa_error(ctx, GL_INVALID_VALUE, "glClientWaitSync(flags=0x%x)", flags); return GL_WAIT_FAILED; } @@ -352,15 +352,12 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if (flags != 0) { - _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags); + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(flags=0x%x)", flags); return; } - /* From the GL_ARB_sync spec: - * - * If the value of <timeout> is zero, then WaitSync does nothing. - */ - if (timeout == 0) { + if (timeout != GL_TIMEOUT_IGNORED) { + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout); return; } |