diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
| commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
| tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /mesalib/src/mesa/main | |
| parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/errors.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index e1a9fe2f5..28357e0e8 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -856,7 +856,7 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length, length = strlen(message); emptySlot = &ctx->Debug.DebugGroupMsgs[ctx->Debug.GroupStackDepth]; store_message_details(emptySlot, gl_enum_to_debug_source(source), - gl_enum_to_debug_source(GL_DEBUG_TYPE_PUSH_GROUP), + gl_enum_to_debug_type(GL_DEBUG_TYPE_PUSH_GROUP), id, gl_enum_to_debug_severity(GL_DEBUG_SEVERITY_NOTIFICATION), length, message); diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index f9736938a..3157491bf 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -71,7 +71,7 @@ static struct gl_sync_object * _mesa_new_sync_object(struct gl_context *ctx, GLenum type) { - struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object); + struct gl_sync_object *s = CALLOC_STRUCT(gl_sync_object); (void) ctx; (void) type; |