diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
| commit | b86e8562b1ddca2a8bc29f22a79451a041bf5293 (patch) | |
| tree | 60fead0638fce6922b4043767fa991ff1f0e3488 /mesalib/src/mesa/tnl/t_vb_texgen.c | |
| parent | 53192e17e55aa9ed3e3721bf4fdcb2b01a595202 (diff) | |
| download | vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.gz vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.bz2 vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.zip | |
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/mesa/tnl/t_vb_texgen.c')
| -rw-r--r-- | mesalib/src/mesa/tnl/t_vb_texgen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/tnl/t_vb_texgen.c b/mesalib/src/mesa/tnl/t_vb_texgen.c index d4c788523..c757ac522 100644 --- a/mesalib/src/mesa/tnl/t_vb_texgen.c +++ b/mesalib/src/mesa/tnl/t_vb_texgen.c @@ -562,7 +562,7 @@ static GLboolean alloc_texgen_data( struct gl_context *ctx, struct texgen_stage_data *store; GLuint i; - stage->privatePtr = CALLOC(sizeof(*store)); + stage->privatePtr = calloc(1, sizeof(*store)); store = TEXGEN_STAGE_DATA(stage); if (!store) return GL_FALSE; @@ -570,8 +570,8 @@ static GLboolean alloc_texgen_data( struct gl_context *ctx, for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 ); - store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3); - store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat)); + store->tmp_f = (GLfloat (*)[3]) malloc(VB->Size * sizeof(GLfloat) * 3); + store->tmp_m = (GLfloat *) malloc(VB->Size * sizeof(GLfloat)); return GL_TRUE; } @@ -589,9 +589,9 @@ static void free_texgen_data( struct tnl_pipeline_stage *stage ) _mesa_vector4f_free( &store->texcoord[i] ); - if (store->tmp_f) FREE( store->tmp_f ); - if (store->tmp_m) FREE( store->tmp_m ); - FREE( store ); + if (store->tmp_f) free( store->tmp_f ); + if (store->tmp_m) free( store->tmp_m ); + free( store ); stage->privatePtr = NULL; } } |