gallium: rename draw_free_tmps->draw_free_temp_verts, draw_alloc_tmps->draw_alloc_tem...

diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/mesa/pipe/draw/draw_clip.c
index 61130c5600ab90c6598ce7aa62a9c3bb44b1c952..e3051507eaf16ebaf0d6203f14dc9148af7e7319 100644 (file)
--- a/src/mesa/pipe/draw/draw_clip.c
+++ b/src/mesa/pipe/draw/draw_clip.c
@@ -459,7 +459,7 @@ static void clip_reset_stipple_counter( struct draw_stage *stage )
 
 static void clip_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -472,7 +472,7 @@ struct draw_stage *draw_clip_stage( struct draw_context *draw )
 {
    struct clipper *clipper = CALLOC_STRUCT(clipper);
 
-   draw_alloc_tmps( &clipper->stage, MAX_CLIPPED_VERTICES+1 );
+   draw_alloc_temp_verts( &clipper->stage, MAX_CLIPPED_VERTICES+1 );
 
    clipper->stage.draw = draw;
    clipper->stage.point = clip_point;

diff --git a/src/mesa/pipe/draw/draw_context.c b/src/mesa/pipe/draw/draw_context.c
index b15f57c824896b43f62d3b923e3f3a09ea3a685c..4be3830316954b609e16107fe3d7f39bdf661d1b 100644 (file)
--- a/src/mesa/pipe/draw/draw_context.c
+++ b/src/mesa/pipe/draw/draw_context.c
@@ -242,7 +242,7 @@ draw_convert_wide_lines(struct draw_context *draw, boolean enable)
 /**
  * Allocate space for temporary post-transform vertices, such as for clipping.
  */
-void draw_alloc_tmps( struct draw_stage *stage, unsigned nr )
+void draw_alloc_temp_verts( struct draw_stage *stage, unsigned nr )
 {
    assert(!stage->tmp);
 
@@ -260,7 +260,7 @@ void draw_alloc_tmps( struct draw_stage *stage, unsigned nr )
 }
 
 
-void draw_free_tmps( struct draw_stage *stage )
+void draw_free_temp_verts( struct draw_stage *stage )
 {
    if (stage->tmp) {
       FREE( stage->tmp[0] );

diff --git a/src/mesa/pipe/draw/draw_cull.c b/src/mesa/pipe/draw/draw_cull.c
index 05c274e4dc20c5a9095ad4287a544236599a9808..8177b0ac86ebaaceac5d65f803e32ea4592f5145 100644 (file)
--- a/src/mesa/pipe/draw/draw_cull.c
+++ b/src/mesa/pipe/draw/draw_cull.c
@@ -123,7 +123,7 @@ static void cull_reset_stipple_counter( struct draw_stage *stage )
 
 static void cull_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -135,7 +135,7 @@ struct draw_stage *draw_cull_stage( struct draw_context *draw )
 {
    struct cull_stage *cull = CALLOC_STRUCT(cull_stage);
 
-   draw_alloc_tmps( &cull->stage, 0 );
+   draw_alloc_temp_verts( &cull->stage, 0 );
 
    cull->stage.draw = draw;
    cull->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_flatshade.c b/src/mesa/pipe/draw/draw_flatshade.c
index 1419f287d2cad0fc48fd889e9559498f6e7e01fe..4398abbc60c953775eb15d61b7775535afb63cae 100644 (file)
--- a/src/mesa/pipe/draw/draw_flatshade.c
+++ b/src/mesa/pipe/draw/draw_flatshade.c
@@ -176,7 +176,7 @@ static void flatshade_reset_stipple_counter( struct draw_stage *stage )
 
 static void flatshade_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -188,7 +188,7 @@ struct draw_stage *draw_flatshade_stage( struct draw_context *draw )
 {
    struct flat_stage *flatshade = CALLOC_STRUCT(flat_stage);
 
-   draw_alloc_tmps( &flatshade->stage, 2 );
+   draw_alloc_temp_verts( &flatshade->stage, 2 );
 
    flatshade->stage.draw = draw;
    flatshade->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_offset.c b/src/mesa/pipe/draw/draw_offset.c
index a2990ee8a88aa8a4cc5508ce0f745c13760526b8..dbc676deae42de93771d8117a60973d1ec1f132d 100644 (file)
--- a/src/mesa/pipe/draw/draw_offset.c
+++ b/src/mesa/pipe/draw/draw_offset.c
@@ -159,7 +159,7 @@ static void offset_reset_stipple_counter( struct draw_stage *stage )
 
 static void offset_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -171,7 +171,7 @@ struct draw_stage *draw_offset_stage( struct draw_context *draw )
 {
    struct offset_stage *offset = CALLOC_STRUCT(offset_stage);
 
-   draw_alloc_tmps( &offset->stage, 3 );
+   draw_alloc_temp_verts( &offset->stage, 3 );
 
    offset->stage.draw = draw;
    offset->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h
index 7782db04770ebe27ea9f895d9e105f46228318ab..b17eaaed65e405efad6e88b3207f20b3433fd12d 100644 (file)
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/mesa/pipe/draw/draw_private.h
@@ -276,9 +276,9 @@ extern struct draw_stage *draw_wide_stage( struct draw_context *context );
 extern struct draw_stage *draw_validate_stage( struct draw_context *context );
 
 
-extern void draw_free_tmps( struct draw_stage *stage );
-extern void draw_reset_tmps( struct draw_stage *stage );
-extern void draw_alloc_tmps( struct draw_stage *stage, unsigned nr );
+extern void draw_free_temp_verts( struct draw_stage *stage );
+
+extern void draw_alloc_temp_verts( struct draw_stage *stage, unsigned nr );
 
 extern void draw_reset_vertex_ids( struct draw_context *draw );
 

diff --git a/src/mesa/pipe/draw/draw_stipple.c b/src/mesa/pipe/draw/draw_stipple.c
index 902910191656d8c8fa6a7169bb971ab7f78dec00..fb8b56e84cc1068031fd10289286b9ae5a8df974 100644 (file)
--- a/src/mesa/pipe/draw/draw_stipple.c
+++ b/src/mesa/pipe/draw/draw_stipple.c
@@ -223,7 +223,7 @@ struct draw_stage *draw_stipple_stage( struct draw_context *draw )
 {
    struct stipple_stage *stipple = CALLOC_STRUCT(stipple_stage);
 
-   draw_alloc_tmps( &stipple->stage, 2 );
+   draw_alloc_temp_verts( &stipple->stage, 2 );
 
    stipple->stage.draw = draw;
    stipple->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_twoside.c b/src/mesa/pipe/draw/draw_twoside.c
index ad2aaf10bb9a59621c96becafd0ab4a662f1fc5d..1c3895798713ddac18692f2ecac59508c9022e13 100644 (file)
--- a/src/mesa/pipe/draw/draw_twoside.c
+++ b/src/mesa/pipe/draw/draw_twoside.c
@@ -176,7 +176,7 @@ static void twoside_reset_stipple_counter( struct draw_stage *stage )
 
 static void twoside_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -188,7 +188,7 @@ struct draw_stage *draw_twoside_stage( struct draw_context *draw )
 {
    struct twoside_stage *twoside = CALLOC_STRUCT(twoside_stage);
 
-   draw_alloc_tmps( &twoside->stage, 3 );
+   draw_alloc_temp_verts( &twoside->stage, 3 );
 
    twoside->stage.draw = draw;
    twoside->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_unfilled.c b/src/mesa/pipe/draw/draw_unfilled.c
index 364bda8b7919092a3ed260f1b8bd6c853ac8b8f9..8bb9f3b5586b7bac9bf21219bed6872d490de8ad 100644 (file)
--- a/src/mesa/pipe/draw/draw_unfilled.c
+++ b/src/mesa/pipe/draw/draw_unfilled.c
@@ -176,7 +176,7 @@ static void unfilled_reset_stipple_counter( struct draw_stage *stage )
 
 static void unfilled_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -188,7 +188,7 @@ struct draw_stage *draw_unfilled_stage( struct draw_context *draw )
 {
    struct unfilled_stage *unfilled = CALLOC_STRUCT(unfilled_stage);
 
-   draw_alloc_tmps( &unfilled->stage, 0 );
+   draw_alloc_temp_verts( &unfilled->stage, 0 );
 
    unfilled->stage.draw = draw;
    unfilled->stage.next = NULL;

diff --git a/src/mesa/pipe/draw/draw_wide_prims.c b/src/mesa/pipe/draw/draw_wide_prims.c
index 4c7e279b20fa35841db122081cb402f8825e1fa7..163282b2268a21da7d72a565037094d8f5324d45 100644 (file)
--- a/src/mesa/pipe/draw/draw_wide_prims.c
+++ b/src/mesa/pipe/draw/draw_wide_prims.c
@@ -408,7 +408,7 @@ static void draw_reset_stipple_counter( struct draw_stage *stage )
 
 static void wide_destroy( struct draw_stage *stage )
 {
-   draw_free_tmps( stage );
+   draw_free_temp_verts( stage );
    FREE( stage );
 }
 
@@ -417,7 +417,7 @@ struct draw_stage *draw_wide_stage( struct draw_context *draw )
 {
    struct wide_stage *wide = CALLOC_STRUCT(wide_stage);
 
-   draw_alloc_tmps( &wide->stage, 4 );
+   draw_alloc_temp_verts( &wide->stage, 4 );
 
    wide->stage.draw = draw;
    wide->stage.next = NULL;