diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
| commit | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (patch) | |
| tree | 88b2bd0c519042f9b8d98dc36f63ff167338d635 /mesalib/src/mesa/main/syncobj.c | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.gz vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.bz2 vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.zip | |
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
xkeyboard-config commit e5a53229a9914235921911f05b31d6092e844ea1
pixman commit 7d05a7f4dc825f9c778e534fdabb749199c2e439
fontconfig commit 0203055520206028eecee5d261887cdc91500e15
mesa commit 848c0e72f36d0e1e460193a2d30b2f631529156f
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index 987d4f57c..ad21f3b67 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -161,8 +161,16 @@ _mesa_free_sync_data(struct gl_context *ctx) } -int -_mesa_validate_sync(struct gl_context *ctx, struct gl_sync_object *syncObj) +/** + * Check if the given sync object is: + * - non-null + * - not in sync objects hash table + * - type is GL_SYNC_FENCE + * - not marked as deleted + */ +bool +_mesa_validate_sync(struct gl_context *ctx, + const struct gl_sync_object *syncObj) { return (syncObj != NULL) && _mesa_set_search(ctx->Shared->SyncObjects, @@ -410,7 +418,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, return; } - if (size > 0) { + if (size > 0 && bufSize > 0) { const GLsizei copy_count = MIN2(size, bufSize); memcpy(values, v, sizeof(GLint) * copy_count); |