diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-11-13 13:49:51 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-11-15 15:21:28 -0800 |
| commit | 47d862517ea658e5f330a10fc7656c7cd67bfb16 (patch) | |
| tree | dd5f59dd73f26022b9e539b4a2e83f7afc144d09 | |
| parent | 32cc20d9f52ef48e6cbfb8e8b90a5f7660b73421 (diff) | |
mesa: return INVALID_VALUE from WaitSync if timeout != GL_TIMEOUT_IGNORED
This was added in version 22 of the GL_ARB_sync spec.
Fixes gles3conform's sync_error_waitsync_timeout test.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/main/syncobj.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index 430c1eeb56..745e982ad4 100644 --- a/src/mesa/main/syncobj.c +++ b/src/mesa/main/syncobj.c @@ -356,11 +356,8 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) 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; } |