aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/syncobj.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-04 16:28:48 +0200
committermarha <marha@users.sourceforge.net>2013-09-04 16:28:48 +0200
commitb602729f06a62d29e136cf2aeca9544471371e0d (patch)
tree403d96659d5726e26edafb2bbb3c1198e783e3a0 /mesalib/src/mesa/main/syncobj.c
parentcaffc15f0b9e35698a6039fa3df2fa6a588608e6 (diff)
parentb828531d8b6da75a258d12f97df0f4e49f75ab98 (diff)
downloadvcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.gz
vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.bz2
vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig xkeyboard-config git update 4 Sep 2013
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.c')
-rw-r--r--mesalib/src/mesa/main/syncobj.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 5fa548d0d..f9736938a 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -83,6 +83,7 @@ static void
_mesa_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
{
(void) ctx;
+ free(syncObj->Label);
free(syncObj);
}
@@ -160,7 +161,7 @@ _mesa_free_sync_data(struct gl_context *ctx)
}
-static int
+int
_mesa_validate_sync(struct gl_context *ctx, struct gl_sync_object *syncObj)
{
return (syncObj != NULL)