diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /mesalib/src/mesa/main/context.c | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 8d48904f8..83e5de47a 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -759,6 +759,7 @@ init_attrib_groups(struct gl_context *ctx) _mesa_init_depth( ctx ); _mesa_init_debug( ctx ); _mesa_init_display_list( ctx ); + _mesa_init_errors( ctx ); _mesa_init_eval( ctx ); _mesa_init_fbobjects( ctx ); _mesa_init_feedback( ctx ); @@ -1137,6 +1138,8 @@ _mesa_free_context_data( struct gl_context *ctx ) /* needs to be after freeing shared state */ _mesa_free_display_list_data(ctx); + _mesa_free_errors_data(ctx); + if (ctx->Extensions.String) free((void *) ctx->Extensions.String); |