frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Make a bunch of single-file glamor functions static. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Eric Anholt 2015-06-30 14:50:43 -07:00
parent a8e84e8c3b
commit 3fe6731b17
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glamor/glamor_largepixmap.c
View File

@ -2,6 +2,10 @@
#include "glamor_priv.h" #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 * static inline glamor_pixmap_private *
__glamor_large(glamor_pixmap_private *pixmap_priv) { __glamor_large(glamor_pixmap_private *pixmap_priv) {
assert(glamor_pixmap_priv_is_large(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. /* XXX overflow still exist. maybe we need to change to use region32.
* by default. Or just use region32 for repeat cases? * 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, glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
struct pixman_transform *transform, struct pixman_transform *transform,
RegionPtr region, int *n_region, RegionPtr region, int *n_region,
@ -876,7 +880,7 @@ glamor_merge_clipped_regions(PixmapPtr pixmap,
* boundary and can avoid some overhead. * boundary and can avoid some overhead.
* *
**/ **/
Bool static Bool
glamor_get_transform_block_size(struct pixman_transform *transform, glamor_get_transform_block_size(struct pixman_transform *transform,
int block_w, int block_h, int block_w, int block_h,
int *transformed_block_w, int *transformed_block_w,
@ -925,7 +929,7 @@ glamor_get_transform_block_size(struct pixman_transform *transform,
p.v[0] = x; \ p.v[0] = x; \
p.v[1] = y; \ p.v[1] = y; \
p.v[2] = 1.0; } while (0) p.v[2] = 1.0; } while (0)
void static void
glamor_get_transform_extent_from_box(struct pixman_box32 *box, glamor_get_transform_extent_from_box(struct pixman_box32 *box,
struct pixman_transform *transform) struct pixman_transform *transform)
{ {

22
glamor/glamor_priv.h
View File

@ -660,12 +660,6 @@ void glamor_composite(CARD8 op,
void glamor_composite_rects(CARD8 op, void glamor_composite_rects(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
xRenderColor *color, int nRect, xRectangle *rects); 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 */ /* glamor_trapezoid.c */
void glamor_trapezoids(CARD8 op, void glamor_trapezoids(CARD8 op,
@ -741,14 +735,6 @@ glamor_compute_clipped_regions_ext(PixmapPtr pixmap,
int inner_block_w, int inner_block_h, int inner_block_w, int inner_block_h,
int reverse, int upsidedown); 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, Bool glamor_composite_largepixmap_region(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
@ -764,14 +750,6 @@ Bool glamor_composite_largepixmap_region(CARD8 op,
INT16 x_dest, INT16 y_dest, INT16 x_dest, INT16 y_dest,
CARD16 width, CARD16 height); 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 * Upload a picture to gl texture. Similar to the
* glamor_upload_pixmap_to_texture. Used in rendering. * glamor_upload_pixmap_to_texture. Used in rendering.

4
glamor/glamor_render.c
View File

@ -604,7 +604,7 @@ glamor_composite_with_copy(CARD8 op,
return ret; return ret;
} }
void * static void *
glamor_setup_composite_vbo(ScreenPtr screen, int n_verts) glamor_setup_composite_vbo(ScreenPtr screen, int n_verts)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
@ -1238,7 +1238,7 @@ glamor_composite_with_shader(CARD8 op,
return ret; return ret;
} }
PicturePtr static PicturePtr
glamor_convert_gradient_picture(ScreenPtr screen, glamor_convert_gradient_picture(ScreenPtr screen,
PicturePtr source, PicturePtr source,
int x_source, int x_source,