diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/main/context.c | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index feddbaa7e..6b28690ec 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -871,7 +871,7 @@ _mesa_alloc_dispatch_table(int size) /* should never happen, but just in case */ numEntries = MAX2(numEntries, size); - table = (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc)); + table = malloc(numEntries * sizeof(_glapi_proc)); if (table) { _glapi_proc *entry = (_glapi_proc *) table; GLint i; @@ -1075,7 +1075,7 @@ _mesa_create_context(gl_api api, ASSERT(visual); /*ASSERT(driverContext);*/ - ctx = (struct gl_context *) calloc(1, sizeof(struct gl_context)); + ctx = calloc(1, sizeof(struct gl_context)); if (!ctx) return NULL; @@ -1158,11 +1158,9 @@ _mesa_free_context_data( struct gl_context *ctx ) _mesa_free_errors_data(ctx); - if (ctx->Extensions.String) - free((void *) ctx->Extensions.String); + free((void *)ctx->Extensions.String); - if (ctx->VersionString) - free(ctx->VersionString); + free(ctx->VersionString); /* unbind the context if it's currently bound */ if (ctx == _mesa_get_current_context()) { |