12 files changed, 37 insertions, 31 deletions
diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h
index 436bda21393..319bb790aea 100644
--- a/src/mesa/pipe/p_util.h
+++ b/src/mesa/pipe/p_util.h
@@ -32,6 +32,8 @@
 
 #define CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
 
+#define FREE( PTR )  free( PTR )
+
 #define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )
 #define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )
 #define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
index d9b914d896b..6a9cf29e471 100644
--- a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
@@ -88,9 +88,9 @@ static void alpha_test_begin(struct quad_stage *qs)
 }
 
 
-static void alpha_test_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void alpha_test_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_blend.c b/src/mesa/pipe/softpipe/sp_quad_blend.c
index cecf8af29ba..696e252af17 100644
--- a/src/mesa/pipe/softpipe/sp_quad_blend.c
+++ b/src/mesa/pipe/softpipe/sp_quad_blend.c
@@ -727,9 +727,9 @@ static void blend_begin(struct quad_stage *qs)
 }
 
 
-static void blend_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void blend_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_bufloop.c b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
index bdf491d4b15..aac70e2b04e 100644
--- a/src/mesa/pipe/softpipe/sp_quad_bufloop.c
+++ b/src/mesa/pipe/softpipe/sp_quad_bufloop.c
@@ -50,9 +50,9 @@ static void cbuf_loop_begin(struct quad_stage *qs)
 }
 
 
-static void cbuf_loop_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void cbuf_loop_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_colormask.c b/src/mesa/pipe/softpipe/sp_quad_colormask.c
index f0aa657e95f..c585aa3eddd 100644
--- a/src/mesa/pipe/softpipe/sp_quad_colormask.c
+++ b/src/mesa/pipe/softpipe/sp_quad_colormask.c
@@ -90,9 +90,9 @@ static void colormask_begin(struct quad_stage *qs)
 }
 
 
-static void colormask_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void colormask_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_coverage.c b/src/mesa/pipe/softpipe/sp_quad_coverage.c
index 25e7b033b95..9dfad7c580a 100644
--- a/src/mesa/pipe/softpipe/sp_quad_coverage.c
+++ b/src/mesa/pipe/softpipe/sp_quad_coverage.c
@@ -69,9 +69,9 @@ static void coverage_begin(struct quad_stage *qs)
 }
 
 
-static void coverage_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void coverage_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
index c24232bf1ec..9cb01d7b2fc 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -231,9 +231,9 @@ static void depth_test_begin(struct quad_stage *qs)
 }
 
 
-static void depth_test_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void depth_test_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 43c4d58ac65..81e405d3db5 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -198,7 +198,11 @@ static void shade_begin(struct quad_stage *qs)
 
 static void shade_destroy(struct quad_stage *qs)
 {
-   free( qs );
+   struct quad_shade_stage *qss = (struct quad_shade_stage *) qs;
+
+   FREE( qss->inputs );
+   FREE( qss->outputs );
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
index 18a36e82862..028d30c92f5 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -64,9 +64,9 @@ static void occlusion_begin(struct quad_stage *qs)
 }
 
 
-static void occlusion_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void occlusion_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_output.c b/src/mesa/pipe/softpipe/sp_quad_output.c
index 09194c14a6f..cebfec18f74 100644
--- a/src/mesa/pipe/softpipe/sp_quad_output.c
+++ b/src/mesa/pipe/softpipe/sp_quad_output.c
@@ -70,9 +70,9 @@ static void output_begin(struct quad_stage *qs)
 }
 
 
-static void output_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void output_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_stencil.c b/src/mesa/pipe/softpipe/sp_quad_stencil.c
index 14aa7df279e..831ad8bad06 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stencil.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stencil.c
@@ -323,9 +323,9 @@ static void stencil_begin(struct quad_stage *qs)
 }
 
 
-static void stencil_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void stencil_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }
 
 
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/mesa/pipe/softpipe/sp_quad_stipple.c
index 7916dcd0caf..fcbbf00c7db 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c
@@ -65,9 +65,9 @@ static void stipple_begin(struct quad_stage *qs)
 }
 
 
-static void stipple_destroy(struct quad_stage *qs)
-{
-   free( qs );
+static void stipple_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }