diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
| commit | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (patch) | |
| tree | 33b215c07359fff941f32fc89a8cf3e968d334a9 /mesalib/src/mesa/main/syncobj.h | |
| parent | 1881d1a5c46cc9efb394f84b69f58c000ee1118b (diff) | |
| parent | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (diff) | |
| download | vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.gz vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.bz2 vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
Conflicts:
mesalib/src/glsl/ast.h
mesalib/src/glsl/glsl_parser_extras.h
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.h')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h index a6563b09d..1dbb7b14a 100644 --- a/mesalib/src/mesa/main/syncobj.h +++ b/mesalib/src/mesa/main/syncobj.h @@ -53,8 +53,9 @@ _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj); extern void GLAPIENTRY _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj); -extern int -_mesa_validate_sync(struct gl_context *ctx, struct gl_sync_object *syncObj); +extern bool +_mesa_validate_sync(struct gl_context *ctx, + const struct gl_sync_object *syncObj); extern GLboolean GLAPIENTRY _mesa_IsSync(GLsync sync); |