summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-11-13 13:49:51 -0800
committerMatt Turner <[email protected]>2012-11-15 15:21:28 -0800
commit47d862517ea658e5f330a10fc7656c7cd67bfb16 (patch)
treedd5f59dd73f26022b9e539b4a2e83f7afc144d09 /src
parent32cc20d9f52ef48e6cbfb8e8b90a5f7660b73421 (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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/syncobj.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 430c1eeb56d..745e982ad48 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;
}