Mesa (master): st/vega: s/free/FREE for matching MALLOC/CALLOC

Chia-I Wu olv at kemper.freedesktop.org
Tue Jun 29 23:27:52 PDT 2010


Module: Mesa
Branch: master
Commit: f914cd1796845164109c837a111c39ba64852ad4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f914cd1796845164109c837a111c39ba64852ad4

Author: nobled <nobled at dreamwidth.org>
Date:   Wed Jun 30 14:24:13 2010 +0800

st/vega: s/free/FREE for matching MALLOC/CALLOC

[Manually fix a conflict in vg_context.c by Chia-I Wu]

---

 src/gallium/state_trackers/vega/image.c         |    2 +-
 src/gallium/state_trackers/vega/mask.c          |    2 +-
 src/gallium/state_trackers/vega/paint.c         |    2 +-
 src/gallium/state_trackers/vega/path.c          |    2 +-
 src/gallium/state_trackers/vega/renderer.c      |    2 +-
 src/gallium/state_trackers/vega/shader.c        |    2 +-
 src/gallium/state_trackers/vega/shaders_cache.c |    6 +++---
 src/gallium/state_trackers/vega/vg_context.c    |    2 +-
 src/gallium/state_trackers/vega/vg_manager.c    |   10 +++++-----
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/gallium/state_trackers/vega/image.c b/src/gallium/state_trackers/vega/image.c
index 7c421df..c12dc71 100644
--- a/src/gallium/state_trackers/vega/image.c
+++ b/src/gallium/state_trackers/vega/image.c
@@ -355,7 +355,7 @@ void image_destroy(struct vg_image *img)
    }
 
    pipe_sampler_view_reference(&img->sampler_view, NULL);
-   free(img);
+   FREE(img);
 }
 
 void image_clear(struct vg_image *img,
diff --git a/src/gallium/state_trackers/vega/mask.c b/src/gallium/state_trackers/vega/mask.c
index 6d627b0..ef28ebd 100644
--- a/src/gallium/state_trackers/vega/mask.c
+++ b/src/gallium/state_trackers/vega/mask.c
@@ -520,7 +520,7 @@ void mask_layer_destroy(struct vg_mask_layer *layer)
 
    vg_context_remove_object(ctx, VG_OBJECT_MASK, layer);
    pipe_resource_release(&layer->texture);
-   free(layer);
+   FREE(layer);
 }
 
 void mask_layer_fill(struct vg_mask_layer *layer,
diff --git a/src/gallium/state_trackers/vega/paint.c b/src/gallium/state_trackers/vega/paint.c
index 05540e8..2c0eb6b 100644
--- a/src/gallium/state_trackers/vega/paint.c
+++ b/src/gallium/state_trackers/vega/paint.c
@@ -236,7 +236,7 @@ void paint_destroy(struct vg_paint *paint)
 
    free(paint->gradient.ramp_stopsi);
    free(paint->gradient.ramp_stops);
-   free(paint);
+   FREE(paint);
 }
 
 void paint_set_color(struct vg_paint *paint,
diff --git a/src/gallium/state_trackers/vega/path.c b/src/gallium/state_trackers/vega/path.c
index 4fc23a7..05f8b0d 100644
--- a/src/gallium/state_trackers/vega/path.c
+++ b/src/gallium/state_trackers/vega/path.c
@@ -218,7 +218,7 @@ void path_destroy(struct path *p)
    if (p->stroked.path)
       path_destroy(p->stroked.path);
 
-   free(p);
+   FREE(p);
 }
 
 VGbitfield path_capabilities(struct path *p)
diff --git a/src/gallium/state_trackers/vega/renderer.c b/src/gallium/state_trackers/vega/renderer.c
index c40ea86..8c02304 100644
--- a/src/gallium/state_trackers/vega/renderer.c
+++ b/src/gallium/state_trackers/vega/renderer.c
@@ -203,7 +203,7 @@ void renderer_destroy(struct renderer *ctx)
       ctx->fs = NULL;
    }
 #endif
-   free(ctx);
+   FREE(ctx);
 }
 
 void renderer_draw_quad(struct renderer *r,
diff --git a/src/gallium/state_trackers/vega/shader.c b/src/gallium/state_trackers/vega/shader.c
index 6eef94c..eab1349 100644
--- a/src/gallium/state_trackers/vega/shader.c
+++ b/src/gallium/state_trackers/vega/shader.c
@@ -68,7 +68,7 @@ struct shader * shader_create(struct vg_context *ctx)
 
 void shader_destroy(struct shader *shader)
 {
-   free(shader);
+   FREE(shader);
 }
 
 void shader_set_masking(struct shader *shader, VGboolean set)
diff --git a/src/gallium/state_trackers/vega/shaders_cache.c b/src/gallium/state_trackers/vega/shaders_cache.c
index f43fe6e..b907a60 100644
--- a/src/gallium/state_trackers/vega/shaders_cache.c
+++ b/src/gallium/state_trackers/vega/shaders_cache.c
@@ -381,7 +381,7 @@ void shaders_cache_destroy(struct shaders_cache *sc)
    }
 
    cso_hash_delete(sc->hash);
-   free(sc);
+   FREE(sc);
 }
 
 void * shaders_cache_fill(struct shaders_cache *sc,
@@ -435,6 +435,6 @@ void vg_shader_destroy(struct vg_context *ctx, struct vg_shader *shader)
       cso_delete_fragment_shader(ctx->cso_context, shader->driver);
    else
       cso_delete_vertex_shader(ctx->cso_context, shader->driver);
-   free(shader->tokens);
-   free(shader);
+   FREE(shader->tokens);
+   FREE(shader);
 }
diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c
index b45e008..5cb2590 100644
--- a/src/gallium/state_trackers/vega/vg_context.c
+++ b/src/gallium/state_trackers/vega/vg_context.c
@@ -221,7 +221,7 @@ void vg_destroy_context(struct vg_context *ctx)
 
    api_destroy_dispatch(ctx->dispatch);
 
-   free(ctx);
+   FREE(ctx);
 }
 
 void vg_init_object(struct vg_object *obj, struct vg_context *ctx, enum vg_object_type type)
diff --git a/src/gallium/state_trackers/vega/vg_manager.c b/src/gallium/state_trackers/vega/vg_manager.c
index bd6b59b..c2aa98b 100644
--- a/src/gallium/state_trackers/vega/vg_manager.c
+++ b/src/gallium/state_trackers/vega/vg_manager.c
@@ -388,7 +388,7 @@ destroy_renderbuffer(struct st_renderbuffer *strb)
 {
    pipe_surface_reference(&strb->surface, NULL);
    pipe_resource_reference(&strb->texture, NULL);
-   free(strb);
+   FREE(strb);
 }
 
 /**
@@ -451,7 +451,7 @@ vg_context_bind_framebuffers(struct st_context_iface *stctxi,
           stfb->strb->format != stdrawi->visual->color_format) {
          destroy_renderbuffer(stfb->strb);
          destroy_renderbuffer(stfb->dsrb);
-         free(stfb);
+         FREE(stfb);
 
          ctx->draw_buffer = NULL;
       }
@@ -471,14 +471,14 @@ vg_context_bind_framebuffers(struct st_context_iface *stctxi,
 
       stfb->strb = create_renderbuffer(stdrawi->visual->color_format);
       if (!stfb->strb) {
-         free(stfb);
+         FREE(stfb);
          return FALSE;
       }
 
       stfb->dsrb = create_renderbuffer(ctx->ds_format);
       if (!stfb->dsrb) {
-         free(stfb->strb);
-         free(stfb);
+         FREE(stfb->strb);
+         FREE(stfb);
          return FALSE;
       }
 



More information about the mesa-commit mailing list