mesa: consistantly use mesa memory-functions in gallium state tracker

Use _mesa_malloc(), _mesa_free(), etc everywhere, not malloc(), free(), etc.
Still using CALLOC_STRUCT() at this point.

diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index fc8587f459836db1a98a7e598af47040ddc2fc7d..f79092291b0a244f1bacaae8fa222988a01746da 100644 (file)
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -69,7 +69,7 @@ void st_init_atoms( struct st_context *st )
 {
    GLuint i;
 
-   st->atoms = malloc(sizeof(atoms));
+   st->atoms = _mesa_malloc(sizeof(atoms));
    st->nr_atoms = sizeof(atoms)/sizeof(*atoms);
    memcpy(st->atoms, atoms, sizeof(atoms));
 
@@ -92,7 +92,7 @@ void st_init_atoms( struct st_context *st )
 void st_destroy_atoms( struct st_context *st )
 {
    if (st->atoms) {
-      free(st->atoms);
+      _mesa_free(st->atoms);
       st->atoms = NULL;
    }
 }

diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index cbd414e2d3b0f4ab8694aabc2f785bdb8edadb65..5653933e123848fcf3e616e948eebb008605d4ef 100644 (file)
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -298,7 +298,7 @@ st_free_translated_vertex_programs(struct st_context *st,
 
    while (xvp) {
       next = xvp->next;
-      free(xvp);
+      _mesa_free(xvp);
       xvp = next;
    }
 }
@@ -313,7 +313,7 @@ get_passthrough_fs(struct st_context *st)
       st->passthrough_fs =
          util_make_fragment_passthrough_shader(st->pipe, &shader);
 #if 0      /* We actually need to keep the tokens around at this time */
-      free((void *) shader.tokens);
+      _mesa_free((void *) shader.tokens);
 #endif
    }
 

diff --git a/src/mesa/state_tracker/st_cb_accum.c b/src/mesa/state_tracker/st_cb_accum.c
index a4e72b48ed4b5cca52461af345bb247a45c7a18a..2fc37343bdfc1a392ff7ce035529029cad1d2af2 100644 (file)
--- a/src/mesa/state_tracker/st_cb_accum.c
+++ b/src/mesa/state_tracker/st_cb_accum.c
@@ -206,8 +206,8 @@ accum_accum(struct pipe_context *pipe, GLfloat value,
    color_surf = screen->get_tex_surface(screen, color_strb->texture, 0, 0, 0,
                                         PIPE_BUFFER_USAGE_CPU_READ);
 
-   colorBuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-   accBuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
+   colorBuf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   accBuf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
 
    pipe_get_tile_rgba(color_surf, xpos, ypos, width, height, colorBuf);
    acc_get_tile_rgba(pipe, acc_surf, xpos, ypos, width, height, accBuf);
@@ -218,8 +218,8 @@ accum_accum(struct pipe_context *pipe, GLfloat value,
 
    acc_put_tile_rgba(pipe, acc_surf, xpos, ypos, width, height, accBuf);
 
-   free(colorBuf);
-   free(accBuf);
+   _mesa_free(colorBuf);
+   _mesa_free(accBuf);
    pipe_surface_reference(&acc_surf, NULL);
    pipe_surface_reference(&color_surf, NULL);
 }
@@ -242,7 +242,7 @@ accum_load(struct pipe_context *pipe, GLfloat value,
    color_surf = screen->get_tex_surface(screen, color_strb->texture, 0, 0, 0,
                                         PIPE_BUFFER_USAGE_CPU_READ);
 
-   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
 
    pipe_get_tile_rgba(color_surf, xpos, ypos, width, height, buf);
 
@@ -252,7 +252,7 @@ accum_load(struct pipe_context *pipe, GLfloat value,
 
    acc_put_tile_rgba(pipe, acc_surf, xpos, ypos, width, height, buf);
 
-   free(buf);
+   _mesa_free(buf);
    pipe_surface_reference(&acc_surf, NULL);
    pipe_surface_reference(&color_surf, NULL);
 }
@@ -271,7 +271,7 @@ accum_return(GLcontext *ctx, GLfloat value,
    GLfloat *abuf, *cbuf = NULL;
    GLint i, ch;
 
-   abuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
+   abuf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
 
    acc_surf = screen->get_tex_surface(screen, acc_strb->texture, 0, 0, 0,
                                       PIPE_BUFFER_USAGE_CPU_READ);
@@ -283,7 +283,7 @@ accum_return(GLcontext *ctx, GLfloat value,
    acc_get_tile_rgba(pipe, acc_surf, xpos, ypos, width, height, abuf);
 
    if (!colormask[0] || !colormask[1] || !colormask[2] || !colormask[3]) {
-      cbuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
+      cbuf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
       pipe_get_tile_rgba(color_surf, xpos, ypos, width, height, cbuf);
    }
 
@@ -301,9 +301,9 @@ accum_return(GLcontext *ctx, GLfloat value,
 
    pipe_put_tile_rgba(color_surf, xpos, ypos, width, height, abuf);
 
-   free(abuf);
+   _mesa_free(abuf);
    if (cbuf)
-      free(cbuf);
+      _mesa_free(cbuf);
    pipe_surface_reference(&acc_surf, NULL);
    pipe_surface_reference(&color_surf, NULL);
 }

diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index f14e562400b7a8f27fd881518edbbd3493bf933c..fff348de59eaa8be4be668fd765af1e0ec8ea523 100644 (file)
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -827,7 +827,7 @@ st_destroy_bitmap(struct st_context *st)
 
    if (st->bitmap.cache) {
       pipe_texture_release(&st->bitmap.cache->texture);
-      FREE(st->bitmap.cache);
+      _mesa_free(st->bitmap.cache);
       st->bitmap.cache = NULL;
    }
 }

diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 07fa2afce055e86f0fb84578fe028366e9857332..e601ec46f8f74f78e40d3735356316f3e3a5b345 100644 (file)
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -80,7 +80,7 @@ st_bufferobj_free(GLcontext *ctx, struct gl_buffer_object *obj)
    if (st_obj->buffer) 
       pipe_buffer_reference(pipe->screen, &st_obj->buffer, NULL);
 
-   free(st_obj);
+   _mesa_free(st_obj);
 }
 
 

diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 668c3f9ebf4aa6a85da09bcbc00333ffcd38a20d..0eddda23a7ae651cdd431144dd5dbda7351970a3 100644 (file)
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -98,12 +98,12 @@ st_destroy_clear(struct st_context *st)
    struct pipe_context *pipe = st->pipe;
 
    if (st->clear.vert_shader.tokens) {
-      FREE((void *) st->clear.vert_shader.tokens);
+      _mesa_free((void *) st->clear.vert_shader.tokens);
       st->clear.vert_shader.tokens = NULL;
    }
 
    if (st->clear.frag_shader.tokens) {
-      FREE((void *) st->clear.frag_shader.tokens);
+      _mesa_free((void *) st->clear.frag_shader.tokens);
       st->clear.frag_shader.tokens = NULL;
    }
 

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 32bf21411da9d50fa89be7a7008346e484f9fa92..cb4a01c22b6598faeeacd5e33e1f447958409821 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -896,7 +896,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    ubyte *buffer;
    int i;
 
-   buffer = malloc(width * height * sizeof(ubyte));
+   buffer = _mesa_malloc(width * height * sizeof(ubyte));
    if (!buffer) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels(stencil)");
       return;
@@ -950,7 +950,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       }
    }
 
-   free(buffer);
+   _mesa_free(buffer);
 
    /* unmap the stencil buffer */
    screen->surface_unmap(screen, psDraw);
@@ -1056,19 +1056,19 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       if (type == GL_COLOR) {
          /* alternate path using get/put_tile() */
-         GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
+         GLfloat *buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
 
          pipe_get_tile_rgba(psRead, srcx, srcy, width, height, buf);
          pipe_put_tile_rgba(psTex, 0, 0, width, height, buf);
 
-         free(buf);
+         _mesa_free(buf);
       }
       else {
          /* GL_DEPTH */
-         GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));
+         GLuint *buf = (GLuint *) _mesa_malloc(width * height * sizeof(GLuint));
          pipe_get_tile_z(psRead, srcx, srcy, width, height, buf);
          pipe_put_tile_z(psTex, 0, 0, width, height, buf);
-         free(buf);
+         _mesa_free(buf);
       }
       pipe_surface_reference(&psRead, NULL);
    }

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 9af648b8d0fda6a04fc81576fe0b5ad4e08d182b..fd85a7a305008b83a8753244c5b7388e0610d0ca 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -194,7 +194,7 @@ st_renderbuffer_delete(struct gl_renderbuffer *rb)
    ASSERT(strb);
    pipe_surface_reference(&strb->surface, NULL);
    pipe_texture_reference(&strb->texture, NULL);
-   free(strb);
+   _mesa_free(strb);
 }
 
 

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index ea0fa20012ef3bfff334238df0b4af2120e0df06..44f47865f80147282867b7af8ec3f152951478f2 100644 (file)
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -152,7 +152,7 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
          }
 
          if (stvp->state.tokens) {
-            FREE((void *) stvp->state.tokens);
+            _mesa_free((void *) stvp->state.tokens);
             stvp->state.tokens = NULL;
          }
       }
@@ -167,7 +167,7 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
          }
          
          if (stfp->state.tokens) {
-            FREE((void *) stfp->state.tokens);
+            _mesa_free((void *) stfp->state.tokens);
             stfp->state.tokens = NULL;
          }
 
@@ -214,7 +214,7 @@ static void st_program_string_notify( GLcontext *ctx,
       }
 
       if (stfp->state.tokens) {
-         FREE((void *) stfp->state.tokens);
+         _mesa_free((void *) stfp->state.tokens);
          stfp->state.tokens = NULL;
       }
 
@@ -242,7 +242,7 @@ static void st_program_string_notify( GLcontext *ctx,
       }
 
       if (stvp->state.tokens) {
-         FREE((void *) stvp->state.tokens);
+         _mesa_free((void *) stvp->state.tokens);
          stvp->state.tokens = NULL;
       }
 

diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index 21c2c7dd9ffec1bf434b86f56745e54531890c37..bd2716a45f5fc9eae1456dee4afbb0ab81aacbc4 100644 (file)
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -87,7 +87,7 @@ st_DeleteQuery(GLcontext *ctx, struct gl_query_object *q)
       stq->pq = NULL;
    }
 
-   FREE(stq);
+   _mesa_free(stq);
 }
 
 

diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 8867ca5652efa755df009cef13faa8174876f0f4..f4057778bda953922f82b685d694031ccf71bfa4 100644 (file)
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -102,7 +102,7 @@ rastpos_line( struct draw_stage *stage, struct prim_header *prim )
 static void
 rastpos_destroy(struct draw_stage *stage)
 {
-   free(stage);
+   _mesa_free(stage);
 }
 
 

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index e584a6ceeacda420cf0628b176f3755e6a772c4b..34f76d44625fe7bdea42a5e7e61061a5440688b4 100644 (file)
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -217,7 +217,7 @@ static void st_destroy_context_priv( struct st_context *st )
       st->default_texture = NULL;
    }
 
-   free( st );
+   _mesa_free( st );
 }
 
  
@@ -245,7 +245,7 @@ void st_destroy_context( struct st_context *st )
 
    pipe->destroy( pipe );
 
-   free(ctx);
+   _mesa_free(ctx);
 }
 
 

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index ae71d586c2fabac8e684c697b87686098005e27b..b52e488612867110035bef0d8a70561d019136ba 100644 (file)
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -223,7 +223,7 @@ setup_edgeflags(GLcontext *ctx, GLenum primMode, GLint start, GLint count,
       if (!stobj)
          return NULL;
 
-      vec = (unsigned *) calloc(sizeof(unsigned), (count + 31) / 32);
+      vec = (unsigned *) _mesa_calloc(sizeof(unsigned) * ((count + 31) / 32));
       if (!vec)
          return NULL;
 

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 442eeed1470a34515640c575e97ccfaa0633f053..d2535b6a2fa51f571ff4569eee29a8bc09984be1 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -61,9 +61,9 @@
 static INLINE void *
 mem_dup(const void *src, uint size)
 {
-   void *dup = MALLOC(size);
+   void *dup = _mesa_malloc(size);
    if (dup)
-      memcpy(dup, src, size);
+      _mesa_memcpy(dup, src, size);
    return dup;
 }
 
@@ -307,7 +307,7 @@ st_translate_vertex_program(struct st_context *st,
 
    /* free old shader state, if any */
    if (stvp->state.tokens) {
-      FREE((void *) stvp->state.tokens);
+      _mesa_free((void *) stvp->state.tokens);
       stvp->state.tokens = NULL;
    }
    if (stvp->driver_shader) {