diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 1999-10-10 13:04:17 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 1999-10-10 13:04:17 +0000 |
| commit | 567a1de66606ebbb3e54140925a84f5095101532 (patch) | |
| tree | 2dad4375920fc4ae149c8b933dc08ca99af65608 /src/mesa/main | |
| parent | 60a249d009acec34bd61e12f01caf7bdf87e895c (diff) | |
now using GL_MALLOC, GL_FREE
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/image.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 8d9c6e7036..a9bc00db07 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.13 1999/10/10 12:49:36 brianp Exp $ */ +/* $Id: context.c,v 1.14 1999/10/10 13:04:54 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -365,7 +365,7 @@ static struct gl_shared_state *alloc_shared_state( void ) struct gl_shared_state *ss; GLboolean outOfMemory; - ss = (struct gl_shared_state*) calloc( 1, sizeof(struct gl_shared_state) ); + ss = GL_CALLOC_STRUCT(gl_shared_state); if (!ss) return NULL; @@ -1127,7 +1127,7 @@ GLvisual *gl_create_visual( GLboolean rgbFlag, return NULL; } - vis = (GLvisual *) calloc( 1, sizeof(GLvisual) ); + vis = (GLvisual *) GL_CALLOC( sizeof(GLvisual) ); if (!vis) { return NULL; } @@ -1250,7 +1250,7 @@ GLcontext *gl_create_context( GLvisual *visual, /* misc one-time initializations */ one_time_init(); - ctx = (GLcontext *) calloc( 1, sizeof(GLcontext) ); + ctx = (GLcontext *) GL_CALLOC( sizeof(GLcontext) ); if (!ctx) { return NULL; } @@ -1484,7 +1484,7 @@ GLframebuffer *gl_create_framebuffer( GLvisual *visual ) { GLframebuffer *buffer; - buffer = (GLframebuffer *) calloc( 1, sizeof(GLframebuffer) ); + buffer = (GLframebuffer *) GL_CALLOC( sizeof(GLframebuffer) ); if (!buffer) { return NULL; } diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index b963d16c9b..781efad855 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.4 1999/10/10 12:54:04 brianp Exp $ */ +/* $Id: image.c,v 1.5 1999/10/10 13:04:17 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -483,7 +483,7 @@ GLvoid *gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing, */ static struct gl_image *alloc_image( void ) { - return (struct gl_image *) calloc(sizeof(struct gl_image), 1); + return GL_CALLOC_STRUCT(gl_image); } diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index b95911613b..e46b318a44 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.4 1999/10/09 20:17:07 brianp Exp $ */ +/* $Id: texobj.c,v 1.5 1999/10/10 13:04:17 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -159,7 +159,7 @@ void gl_free_texture_object( struct gl_shared_state *shared, } } /* free this object */ - free( t ); + GL_FREE( t ); } |