From 47d862517ea658e5f330a10fc7656c7cd67bfb16 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 13 Nov 2012 13:49:51 -0800 Subject: [PATCH] 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 --- src/mesa/main/syncobj.c | 7 ++----- 1 file 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 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; } -- 2.30.2