[Mesa-dev] [PATCH] mesa: return INVALID_VALUE from WaitSync if timeout != GL_TIMEOUT_IGNORED

[Kenneth Graunke]

On 11/13/2012 02:52 PM, Matt Turner wrote:
> This was added in version 22 of the GL_ARB_sync spec.
>
> Fixes gles3conform's sync_error_waitsync_timeout test.
> ---
>   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 430c1ee..745e982 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;
>      }

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>