[PATCH 5/7] glamor: Make a bunch of single-file glamor functions static.

[Eric Anholt]

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor_largepixmap.c | 10 +++++++---
 glamor/glamor_priv.h        | 22 ----------------------
 glamor/glamor_render.c      |  4 ++--
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c
index cbfd033..9a6c95e 100644
--- a/glamor/glamor_largepixmap.c
+++ b/glamor/glamor_largepixmap.c
@@ -2,6 +2,10 @@
 
 #include "glamor_priv.h"
 
+static void
+glamor_get_transform_extent_from_box(struct pixman_box32 *box,
+                                     struct pixman_transform *transform);
+
 static inline glamor_pixmap_private *
 __glamor_large(glamor_pixmap_private *pixmap_priv) {
     assert(glamor_pixmap_priv_is_large(pixmap_priv));
@@ -681,7 +685,7 @@ glamor_compute_clipped_regions(PixmapPtr pixmap,
 /* XXX overflow still exist. maybe we need to change to use region32.
  * by default. Or just use region32 for repeat cases?
  **/
-glamor_pixmap_clipped_regions *
+static glamor_pixmap_clipped_regions *
 glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
                                          struct pixman_transform *transform,
                                          RegionPtr region, int *n_region,
@@ -876,7 +880,7 @@ glamor_merge_clipped_regions(PixmapPtr pixmap,
  * boundary and can avoid some overhead.
  *
  **/
-Bool
+static Bool
 glamor_get_transform_block_size(struct pixman_transform *transform,
                                 int block_w, int block_h,
                                 int *transformed_block_w,
@@ -925,7 +929,7 @@ glamor_get_transform_block_size(struct pixman_transform *transform,
 	p.v[0] = x;  \
 	p.v[1] = y;  \
 	p.v[2] = 1.0; } while (0)
-void
+static void
 glamor_get_transform_extent_from_box(struct pixman_box32 *box,
                                      struct pixman_transform *transform)
 {
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 43c1231..7e7bae7 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -651,12 +651,6 @@ void glamor_fini_composite_shaders(ScreenPtr screen);
 void glamor_composite_rects(CARD8 op,
                             PicturePtr pDst,
                             xRenderColor *color, int nRect, xRectangle *rects);
-PicturePtr glamor_convert_gradient_picture(ScreenPtr screen,
-                                           PicturePtr source,
-                                           int x_source,
-                                           int y_source, int width, int height);
-
-void *glamor_setup_composite_vbo(ScreenPtr screen, int n_verts);
 
 /* glamor_trapezoid.c */
 void glamor_trapezoids(CARD8 op,
@@ -733,14 +727,6 @@ glamor_compute_clipped_regions_ext(PixmapPtr pixmap,
                                    int inner_block_w, int inner_block_h,
                                    int reverse, int upsidedown);
 
-glamor_pixmap_clipped_regions *
-glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
-                                         struct pixman_transform *transform,
-                                         RegionPtr region,
-                                         int *n_region, int dx, int dy,
-                                         int repeat_type, int reverse,
-                                         int upsidedown);
-
 Bool glamor_composite_largepixmap_region(CARD8 op,
                                          PicturePtr source,
                                          PicturePtr mask,
@@ -756,14 +742,6 @@ Bool glamor_composite_largepixmap_region(CARD8 op,
                                          INT16 x_dest, INT16 y_dest,
                                          CARD16 width, CARD16 height);
 
-Bool glamor_get_transform_block_size(struct pixman_transform *transform,
-                                     int block_w, int block_h,
-                                     int *transformed_block_w,
-                                     int *transformed_block_h);
-
-void glamor_get_transform_extent_from_box(struct pixman_box32 *temp_box,
-                                          struct pixman_transform *transform);
-
 /**
  * Upload a picture to gl texture. Similar to the
  * glamor_upload_pixmap_to_texture. Used in rendering.
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 05eee91..0c776af 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -660,7 +660,7 @@ glamor_composite_with_copy(CARD8 op,
     return ret;
 }
 
-void *
+static void *
 glamor_setup_composite_vbo(ScreenPtr screen, int n_verts)
 {
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
@@ -1301,7 +1301,7 @@ glamor_composite_with_shader(CARD8 op,
     return ret;
 }
 
-PicturePtr
+static PicturePtr
 glamor_convert_gradient_picture(ScreenPtr screen,
                                 PicturePtr source,
                                 int x_source,
-- 
2.1.4