Use FREE instead of free. Fix newlines.

diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h
index 436bda21393b10b693292911692a89bc4b31e32c..319bb790aea263a8a00e11fed672aa8d8dacda38 100644 (file)
--- 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 d9b914d896b942361bd086abeb0a95b2b470bda6..6a9cf29e47114fd94681ed6527115d58c13151b8 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 cecf8af29ba1fd2c67a2c7d98279bca3c07bf3e2..696e252af17309e9d18cc82d2449b09e75b86697 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 bdf491d4b1575e34db01a7030fc2c34dfdf159e5..aac70e2b04e473c39e21f9d7fc3869d2df6bb037 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 f0aa657e95f6070d8161a31622e0f5a1c080c9a3..c585aa3eddd35dc33a399136c017fccfcf056689 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 25e7b033b95a79003c33c57a73cd8676a50267f1..9dfad7c580acfa0dbea3c6b7019724063099e22b 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 c24232bf1ecf3b8ab8a3a188c1f639cac16081f1..9cb01d7b2fc441a64251a2fe46030a12d9be5933 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 43c4d58ac65b829f4b6cf9f0a5d0c91ad946cbdf..81e405d3db5b73200b29a14c088e618e932d6f64 100644 (file)
--- 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 18a36e82862e55b96b3fb6a5b366a34393ca8083..028d30c92f53f49ed71d8a7b8aa33416b52b5a5a 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 09194c14a6f083654e6a6afdcd0bc123a22b9613..cebfec18f74f5594672c72ebbf428e46a750d883 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 14aa7df279eb8e47bc262ec7eb963d9f4c3e68ae..831ad8bad06292ef9c26ef69f624c2bd0cf1bcfe 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+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 7916dcd0cafdc55c1622216be8c20daf15d673f7..fcbbf00c7dba0a8b72885849a1148319d2d9d383 100644 (file)
--- 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)\r
-{\r
-   free( qs );\r
+static void stipple_destroy(struct quad_stage *qs)
+{
+   FREE( qs );
 }