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

glamor: Fix some indent damage of putting a ' ' after the '*' for pointers. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2013-12-27 11:46:30 -08:00
parent 5f57d436c3
commit 7f6e865359
15 changed files with 152 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor.c
View File

@ -206,7 +206,7 @@ Bool
glamor_destroy_pixmap(PixmapPtr pixmap) glamor_destroy_pixmap(PixmapPtr pixmap)
{ {
glamor_screen_private glamor_screen_private
* glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen); *glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen);
if (glamor_priv->dri3_enabled) if (glamor_priv->dri3_enabled)
glamor_egl_destroy_textured_pixmap(pixmap); glamor_egl_destroy_textured_pixmap(pixmap);
else else
@ -473,7 +473,7 @@ glamor_release_screen_priv(ScreenPtr screen)
} }
_X_EXPORT void _X_EXPORT void
glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private * priv) glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
{ {
glamor_pixmap_private *old_priv; glamor_pixmap_private *old_priv;
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;

16
glamor/glamor.h
View File

@ -366,7 +366,7 @@ extern _X_EXPORT Bool glamor_trapezoids_nf(CARD8 op,
PicturePtr src, PicturePtr dst, PicturePtr src, PicturePtr dst,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 y_src, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps); int ntrap, xTrapezoid *traps);
extern _X_EXPORT Bool glamor_glyphs_nf(CARD8 op, extern _X_EXPORT Bool glamor_glyphs_nf(CARD8 op,
PicturePtr src, PicturePtr src,
@ -374,14 +374,14 @@ extern _X_EXPORT Bool glamor_glyphs_nf(CARD8 op,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 x_src,
INT16 y_src, int nlist, INT16 y_src, int nlist,
GlyphListPtr list, GlyphPtr * glyphs); GlyphListPtr list, GlyphPtr *glyphs);
extern _X_EXPORT Bool glamor_triangles_nf(CARD8 op, extern _X_EXPORT Bool glamor_triangles_nf(CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pDst, PicturePtr pDst,
PictFormatPtr maskFormat, PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, INT16 xSrc, INT16 ySrc,
int ntris, xTriangle * tris); int ntris, xTriangle *tris);
extern _X_EXPORT void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph); extern _X_EXPORT void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph);
@ -395,7 +395,7 @@ extern _X_EXPORT Bool glamor_get_spans_nf(DrawablePtr drawable, int wmax,
extern _X_EXPORT Bool glamor_composite_rects_nf(CARD8 op, extern _X_EXPORT Bool glamor_composite_rects_nf(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
xRenderColor * color, xRenderColor *color,
int nRect, xRectangle *rects); int nRect, xRectangle *rects);
extern _X_EXPORT Bool glamor_get_image_nf(DrawablePtr pDrawable, int x, int y, extern _X_EXPORT Bool glamor_get_image_nf(DrawablePtr pDrawable, int x, int y,
@ -405,7 +405,7 @@ extern _X_EXPORT Bool glamor_get_image_nf(DrawablePtr pDrawable, int x, int y,
extern _X_EXPORT Bool glamor_add_traps_nf(PicturePtr pPicture, extern _X_EXPORT Bool glamor_add_traps_nf(PicturePtr pPicture,
INT16 x_off, INT16 x_off,
INT16 y_off, int ntrap, INT16 y_off, int ntrap,
xTrap * traps); xTrap *traps);
extern _X_EXPORT Bool glamor_copy_plane_nf(DrawablePtr pSrc, DrawablePtr pDst, extern _X_EXPORT Bool glamor_copy_plane_nf(DrawablePtr pSrc, DrawablePtr pDst,
GCPtr pGC, int srcx, int srcy, int w, GCPtr pGC, int srcx, int srcy, int w,
@ -416,13 +416,13 @@ extern _X_EXPORT Bool glamor_copy_plane_nf(DrawablePtr pSrc, DrawablePtr pDst,
extern _X_EXPORT Bool glamor_image_glyph_blt_nf(DrawablePtr pDrawable, extern _X_EXPORT Bool glamor_image_glyph_blt_nf(DrawablePtr pDrawable,
GCPtr pGC, int x, int y, GCPtr pGC, int x, int y,
unsigned int nglyph, unsigned int nglyph,
CharInfoPtr * ppci, CharInfoPtr *ppci,
pointer pglyphBase); pointer pglyphBase);
extern _X_EXPORT Bool glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, extern _X_EXPORT Bool glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, int x, int y,
unsigned int nglyph, unsigned int nglyph,
CharInfoPtr * ppci, CharInfoPtr *ppci,
pointer pglyphBase); pointer pglyphBase);
extern _X_EXPORT Bool glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap, extern _X_EXPORT Bool glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap,
@ -433,7 +433,7 @@ extern _X_EXPORT Bool glamor_poly_point_nf(DrawablePtr pDrawable, GCPtr pGC,
int mode, int npt, DDXPointPtr ppt); int mode, int npt, DDXPointPtr ppt);
extern _X_EXPORT Bool glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC, extern _X_EXPORT Bool glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC,
int nseg, xSegment * pSeg); int nseg, xSegment *pSeg);
extern _X_EXPORT Bool glamor_poly_line_nf(DrawablePtr pDrawable, GCPtr pGC, extern _X_EXPORT Bool glamor_poly_line_nf(DrawablePtr pDrawable, GCPtr pGC,
int mode, int npt, DDXPointPtr ppt); int mode, int npt, DDXPointPtr ppt);

6
glamor/glamor_addtraps.c
View File

@ -31,7 +31,7 @@
static Bool static Bool
_glamor_add_traps(PicturePtr pPicture, _glamor_add_traps(PicturePtr pPicture,
INT16 x_off, INT16 x_off,
INT16 y_off, int ntrap, xTrap * traps, Bool fallback) INT16 y_off, int ntrap, xTrap *traps, Bool fallback)
{ {
if (!fallback if (!fallback
&& (!pPicture->pDrawable && (!pPicture->pDrawable
@ -48,14 +48,14 @@ _glamor_add_traps(PicturePtr pPicture,
void void
glamor_add_traps(PicturePtr pPicture, glamor_add_traps(PicturePtr pPicture,
INT16 x_off, INT16 y_off, int ntrap, xTrap * traps) INT16 x_off, INT16 y_off, int ntrap, xTrap *traps)
{ {
_glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, TRUE); _glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, TRUE);
} }
Bool Bool
glamor_add_traps_nf(PicturePtr pPicture, glamor_add_traps_nf(PicturePtr pPicture,
INT16 x_off, INT16 y_off, int ntrap, xTrap * traps) INT16 x_off, INT16 y_off, int ntrap, xTrap *traps)
{ {
return _glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, FALSE); return _glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, FALSE);
} }

32
glamor/glamor_fbo.c
View File

@ -71,7 +71,7 @@ cache_hbucket(int size)
} }
static glamor_pixmap_fbo * static glamor_pixmap_fbo *
glamor_pixmap_fbo_cache_get(glamor_screen_private * glamor_priv, glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int flag) int w, int h, GLenum format, int flag)
{ {
struct xorg_list *cache; struct xorg_list *cache;
@ -127,7 +127,7 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private * glamor_priv,
} }
void void
glamor_purge_fbo(glamor_pixmap_fbo * fbo) glamor_purge_fbo(glamor_pixmap_fbo *fbo)
{ {
glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv); glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv);
@ -143,7 +143,7 @@ glamor_purge_fbo(glamor_pixmap_fbo * fbo)
} }
static void static void
glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo * fbo) glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
{ {
struct xorg_list *cache; struct xorg_list *cache;
int n_format; int n_format;
@ -176,7 +176,7 @@ glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo * fbo)
} }
static void static void
glamor_pixmap_ensure_fb(glamor_pixmap_fbo * fbo) glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo)
{ {
glamor_gl_dispatch *dispatch; glamor_gl_dispatch *dispatch;
int status; int status;
@ -225,7 +225,7 @@ glamor_pixmap_ensure_fb(glamor_pixmap_fbo * fbo)
} }
glamor_pixmap_fbo * glamor_pixmap_fbo *
glamor_create_fbo_from_tex(glamor_screen_private * glamor_priv, glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, GLint tex, int flag) int w, int h, GLenum format, GLint tex, int flag)
{ {
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;
@ -259,7 +259,7 @@ glamor_create_fbo_from_tex(glamor_screen_private * glamor_priv,
} }
void void
glamor_fbo_expire(glamor_screen_private * glamor_priv) glamor_fbo_expire(glamor_screen_private *glamor_priv)
{ {
struct xorg_list *cache; struct xorg_list *cache;
glamor_pixmap_fbo *fbo_entry, *tmp; glamor_pixmap_fbo *fbo_entry, *tmp;
@ -323,7 +323,7 @@ glamor_fini_pixmap_fbo(ScreenPtr screen)
} }
void void
glamor_destroy_fbo(glamor_pixmap_fbo * fbo) glamor_destroy_fbo(glamor_pixmap_fbo *fbo)
{ {
xorg_list_del(&fbo->list); xorg_list_del(&fbo->list);
glamor_pixmap_fbo_cache_put(fbo); glamor_pixmap_fbo_cache_put(fbo);
@ -331,7 +331,7 @@ glamor_destroy_fbo(glamor_pixmap_fbo * fbo)
} }
static int static int
_glamor_create_tex(glamor_screen_private * glamor_priv, _glamor_create_tex(glamor_screen_private *glamor_priv,
int w, int h, GLenum format) int w, int h, GLenum format)
{ {
glamor_gl_dispatch *dispatch; glamor_gl_dispatch *dispatch;
@ -361,7 +361,7 @@ _glamor_create_tex(glamor_screen_private * glamor_priv,
} }
glamor_pixmap_fbo * glamor_pixmap_fbo *
glamor_create_fbo(glamor_screen_private * glamor_priv, glamor_create_fbo(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int flag) int w, int h, GLenum format, int flag)
{ {
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;
@ -394,10 +394,10 @@ glamor_create_fbo(glamor_screen_private * glamor_priv,
} }
static glamor_pixmap_fbo * static glamor_pixmap_fbo *
_glamor_create_fbo_array(glamor_screen_private * glamor_priv, _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int flag, int w, int h, GLenum format, int flag,
int block_w, int block_h, int block_w, int block_h,
glamor_pixmap_private * pixmap_priv, int has_fbo) glamor_pixmap_private *pixmap_priv, int has_fbo)
{ {
int block_wcnt; int block_wcnt;
int block_hcnt; int block_hcnt;
@ -468,10 +468,10 @@ _glamor_create_fbo_array(glamor_screen_private * glamor_priv,
/* Create a fbo array to cover the w*h region, by using block_w*block_h /* Create a fbo array to cover the w*h region, by using block_w*block_h
* block.*/ * block.*/
glamor_pixmap_fbo * glamor_pixmap_fbo *
glamor_create_fbo_array(glamor_screen_private * glamor_priv, glamor_create_fbo_array(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int flag, int w, int h, GLenum format, int flag,
int block_w, int block_h, int block_w, int block_h,
glamor_pixmap_private * pixmap_priv) glamor_pixmap_private *pixmap_priv)
{ {
pixmap_priv->large.block_w = block_w; pixmap_priv->large.block_w = block_w;
pixmap_priv->large.block_h = block_h; pixmap_priv->large.block_h = block_h;
@ -480,7 +480,7 @@ glamor_create_fbo_array(glamor_screen_private * glamor_priv,
} }
glamor_pixmap_fbo * glamor_pixmap_fbo *
glamor_pixmap_detach_fbo(glamor_pixmap_private * pixmap_priv) glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv)
{ {
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;
@ -497,7 +497,7 @@ glamor_pixmap_detach_fbo(glamor_pixmap_private * pixmap_priv)
/* The pixmap must not be attached to another fbo. */ /* The pixmap must not be attached to another fbo. */
void void
glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo * fbo) glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo)
{ {
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
@ -528,7 +528,7 @@ glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo * fbo)
} }
void void
glamor_pixmap_destroy_fbo(glamor_pixmap_private * priv) glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv)
{ {
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;

12
glamor/glamor_glyphblt.c
View File

@ -31,7 +31,7 @@
static Bool static Bool
_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, _glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase, Bool fallback) CharInfoPtr *ppci, pointer pglyphBase, Bool fallback)
{ {
if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable) if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
&& glamor_ddx_fallback_check_gc(pGC)) && glamor_ddx_fallback_check_gc(pGC))
@ -44,7 +44,7 @@ _glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
void void
glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr *ppci, pointer pglyphBase)
{ {
_glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,
TRUE); TRUE);
@ -53,7 +53,7 @@ glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
Bool Bool
glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr *ppci, pointer pglyphBase)
{ {
return _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, return _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci,
pglyphBase, FALSE); pglyphBase, FALSE);
@ -62,7 +62,7 @@ glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
static Bool static Bool
_glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, _glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase, Bool fallback) CharInfoPtr *ppci, pointer pglyphBase, Bool fallback)
{ {
if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable) if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
&& glamor_ddx_fallback_check_gc(pGC)) && glamor_ddx_fallback_check_gc(pGC))
@ -75,7 +75,7 @@ _glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
void void
glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr *ppci, pointer pglyphBase)
{ {
_glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,
TRUE); TRUE);
@ -84,7 +84,7 @@ glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
Bool Bool
glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase) CharInfoPtr *ppci, pointer pglyphBase)
{ {
return _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, return _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci,
pglyphBase, FALSE); pglyphBase, FALSE);

30
glamor/glamor_glyphs.c
View File

@ -387,7 +387,7 @@ glamor_glyphs_init(ScreenPtr pScreen)
*/ */
static void static void
glamor_glyph_cache_upload_glyph(ScreenPtr screen, glamor_glyph_cache_upload_glyph(ScreenPtr screen,
glamor_glyph_cache_t * cache, glamor_glyph_cache_t *cache,
GlyphPtr glyph, int x, int y) GlyphPtr glyph, int x, int y)
{ {
PicturePtr pGlyphPicture = GlyphPicture(glyph)[screen->myNum]; PicturePtr pGlyphPicture = GlyphPicture(glyph)[screen->myNum];
@ -465,7 +465,7 @@ glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph)
/* Cut and paste from render/glyph.c - probably should export it instead */ /* Cut and paste from render/glyph.c - probably should export it instead */
static void static void
glamor_glyph_extents(int nlist, glamor_glyph_extents(int nlist,
GlyphListPtr list, GlyphPtr * glyphs, BoxPtr extents) GlyphListPtr list, GlyphPtr *glyphs, BoxPtr extents)
{ {
int x1, x2, y1, y2; int x1, x2, y1, y2;
int x, y, n; int x, y, n;
@ -610,12 +610,12 @@ struct glamor_glyph_list {
static Bool static Bool
glyph_new_fixed_list(struct glamor_glyph_list *fixed_list, glyph_new_fixed_list(struct glamor_glyph_list *fixed_list,
GlyphPtr * cur_glyphs, GlyphPtr *cur_glyphs,
GlyphPtr ** head_glyphs, GlyphPtr ** head_glyphs,
GlyphListPtr cur_list, GlyphListPtr cur_list,
int cur_pos, int cur_x, int cur_y, int cur_pos, int cur_x, int cur_y,
int x1, int y1, int x2, int y2, int x1, int y1, int x2, int y2,
GlyphListPtr * head_list, GlyphListPtr *head_list,
int *head_pos, int *head_pos,
int *head_x, int *head_x,
int *head_y, int *fixed_cnt, int type, BoxPtr prev_extents) int *head_y, int *fixed_cnt, int type, BoxPtr prev_extents)
@ -695,7 +695,7 @@ glyph_new_fixed_list(struct glamor_glyph_list *fixed_list,
**/ **/
static int static int
glamor_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr * glyphs, glamor_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr *glyphs,
PictFormatShort mask_format, PictFormatShort mask_format,
ScreenPtr screen, Bool check_fake_overlap, ScreenPtr screen, Bool check_fake_overlap,
struct glamor_glyph_list *fixed_list, int fixed_size) struct glamor_glyph_list *fixed_list, int fixed_size)
@ -1053,7 +1053,7 @@ glamor_glyph_size_to_mask(int size)
} }
static PicturePtr static PicturePtr
glamor_glyph_cache(glamor_screen_private * glamor, GlyphPtr glyph, int *out_x, glamor_glyph_cache(glamor_screen_private *glamor, GlyphPtr glyph, int *out_x,
int *out_y) int *out_y)
{ {
ScreenPtr screen = glamor->screen; ScreenPtr screen = glamor->screen;
@ -1219,8 +1219,8 @@ glamor_glyphs_flush_dst(struct glyphs_flush_dst_arg *arg)
} }
static glamor_glyph_cache_result_t static glamor_glyph_cache_result_t
glamor_buffer_glyph(glamor_screen_private * glamor_priv, glamor_buffer_glyph(glamor_screen_private *glamor_priv,
glamor_glyph_buffer_t * buffer, glamor_glyph_buffer_t *buffer,
PictFormatShort format, PictFormatShort format,
GlyphPtr glyph, struct glamor_glyph *priv, GlyphPtr glyph, struct glamor_glyph *priv,
int x_glyph, int y_glyph, int x_glyph, int y_glyph,
@ -1318,7 +1318,7 @@ glamor_buffer_glyph(glamor_screen_private * glamor_priv,
} }
static void static void
glamor_buffer_glyph_clip(glamor_screen_private * glamor_priv, glamor_buffer_glyph_clip(glamor_screen_private *glamor_priv,
BoxPtr rects, BoxPtr rects,
int nrect, PictFormatShort format, int nrect, PictFormatShort format,
GlyphPtr glyph, struct glamor_glyph *priv, GlyphPtr glyph, struct glamor_glyph *priv,
@ -1373,7 +1373,7 @@ glamor_glyphs_via_mask(CARD8 op,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 x_src,
INT16 y_src, INT16 y_src,
int nlist, GlyphListPtr list, GlyphPtr * glyphs, int nlist, GlyphListPtr list, GlyphPtr *glyphs,
Bool use_mask_cache) Bool use_mask_cache)
{ {
PixmapPtr mask_pixmap = 0; PixmapPtr mask_pixmap = 0;
@ -1591,7 +1591,7 @@ glamor_glyphs_to_dst(CARD8 op,
PicturePtr dst, PicturePtr dst,
INT16 x_src, INT16 x_src,
INT16 y_src, INT16 y_src,
int nlist, GlyphListPtr list, GlyphPtr * glyphs) int nlist, GlyphListPtr list, GlyphPtr *glyphs)
{ {
ScreenPtr screen = dst->pDrawable->pScreen; ScreenPtr screen = dst->pDrawable->pScreen;
int x = 0, y = 0; int x = 0, y = 0;
@ -1653,7 +1653,7 @@ glamor_glyphs_to_dst(CARD8 op,
#define MAX_FIXED_SIZE #define MAX_FIXED_SIZE
static void static void
glamor_glyphs_reset_buffer(glamor_glyph_buffer_t * buffer) glamor_glyphs_reset_buffer(glamor_glyph_buffer_t *buffer)
{ {
buffer->count = 0; buffer->count = 0;
buffer->source = NULL; buffer->source = NULL;
@ -1666,7 +1666,7 @@ _glamor_glyphs(CARD8 op,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 x_src,
INT16 y_src, int nlist, GlyphListPtr list, INT16 y_src, int nlist, GlyphListPtr list,
GlyphPtr * glyphs, Bool fallback) GlyphPtr *glyphs, Bool fallback)
{ {
PictFormatShort format; PictFormatShort format;
int fixed_size, fixed_cnt = 0; int fixed_size, fixed_cnt = 0;
@ -1784,7 +1784,7 @@ glamor_glyphs(CARD8 op,
PicturePtr dst, PicturePtr dst,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 x_src,
INT16 y_src, int nlist, GlyphListPtr list, GlyphPtr * glyphs) INT16 y_src, int nlist, GlyphListPtr list, GlyphPtr *glyphs)
{ {
_glamor_glyphs(op, src, dst, mask_format, x_src, _glamor_glyphs(op, src, dst, mask_format, x_src,
y_src, nlist, list, glyphs, TRUE); y_src, nlist, list, glyphs, TRUE);
@ -1796,7 +1796,7 @@ glamor_glyphs_nf(CARD8 op,
PicturePtr dst, PicturePtr dst,
PictFormatPtr mask_format, PictFormatPtr mask_format,
INT16 x_src, INT16 x_src,
INT16 y_src, int nlist, GlyphListPtr list, GlyphPtr * glyphs) INT16 y_src, int nlist, GlyphListPtr list, GlyphPtr *glyphs)
{ {
return _glamor_glyphs(op, src, dst, mask_format, x_src, return _glamor_glyphs(op, src, dst, mask_format, x_src,
y_src, nlist, list, glyphs, FALSE); y_src, nlist, list, glyphs, FALSE);

10
glamor/glamor_gradient.c
View File

@ -765,7 +765,7 @@ glamor_fini_gradient_shader(ScreenPtr screen)
} }
static void static void
_glamor_gradient_convert_trans_matrix(PictTransform * from, float to[3][3], _glamor_gradient_convert_trans_matrix(PictTransform *from, float to[3][3],
int width, int height, int normalize) int width, int height, int normalize)
{ {
/* /*
@ -825,9 +825,9 @@ _glamor_gradient_convert_trans_matrix(PictTransform * from, float to[3][3],
static int static int
_glamor_gradient_set_pixmap_destination(ScreenPtr screen, _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
glamor_screen_private * glamor_priv, glamor_screen_private *glamor_priv,
PicturePtr dst_picture, PicturePtr dst_picture,
GLfloat * xscale, GLfloat * yscale, GLfloat *xscale, GLfloat *yscale,
int x_source, int y_source, int x_source, int y_source,
float vertices[8], float vertices[8],
float tex_vertices[8], float tex_vertices[8],
@ -909,8 +909,8 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
} }
static int static int
_glamor_gradient_set_stops(PicturePtr src_picture, PictGradient * pgradient, _glamor_gradient_set_stops(PicturePtr src_picture, PictGradient *pgradient,
GLfloat * stop_colors, GLfloat * n_stops) GLfloat *stop_colors, GLfloat *n_stops)
{ {
int i; int i;
int count = 1; int count = 1;

22
glamor/glamor_largepixmap.c
View File

@ -144,7 +144,7 @@ __glamor_compute_clipped_regions(int block_w,
*/ */
glamor_pixmap_clipped_regions * glamor_pixmap_clipped_regions *
glamor_compute_clipped_regions_ext(glamor_pixmap_private * pixmap_priv, glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
RegionPtr region, RegionPtr region,
int *n_region, int *n_region,
int inner_block_w, int inner_block_h, int inner_block_w, int inner_block_h,
@ -325,7 +325,7 @@ _glamor_largepixmap_reflect_fixup(short *xy1, short *xy2, int wh)
* *
*/ */
static glamor_pixmap_clipped_regions * static glamor_pixmap_clipped_regions *
_glamor_compute_clipped_regions(glamor_pixmap_private * pixmap_priv, _glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
RegionPtr region, int *n_region, RegionPtr region, int *n_region,
int repeat_type, int is_transform, int repeat_type, int is_transform,
int reverse, int upsidedown) int reverse, int upsidedown)
@ -659,7 +659,7 @@ _glamor_compute_clipped_regions(glamor_pixmap_private * pixmap_priv,
} }
glamor_pixmap_clipped_regions * glamor_pixmap_clipped_regions *
glamor_compute_clipped_regions(glamor_pixmap_private * priv, RegionPtr region, glamor_compute_clipped_regions(glamor_pixmap_private *priv, RegionPtr region,
int *n_region, int repeat_type, int *n_region, int repeat_type,
int reverse, int upsidedown) int reverse, int upsidedown)
{ {
@ -671,8 +671,8 @@ glamor_compute_clipped_regions(glamor_pixmap_private * priv, RegionPtr region,
* by default. Or just use region32 for repeat cases? * by default. Or just use region32 for repeat cases?
**/ **/
glamor_pixmap_clipped_regions * glamor_pixmap_clipped_regions *
glamor_compute_transform_clipped_regions(glamor_pixmap_private * priv, glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
struct pixman_transform * transform, struct pixman_transform *transform,
RegionPtr region, int *n_region, RegionPtr region, int *n_region,
int dx, int dy, int repeat_type, int dx, int dy, int repeat_type,
int reverse, int upsidedown) int reverse, int upsidedown)
@ -736,9 +736,9 @@ glamor_compute_transform_clipped_regions(glamor_pixmap_private * priv,
* if the clipped result cross the region boundary. * if the clipped result cross the region boundary.
*/ */
static void static void
glamor_merge_clipped_regions(glamor_pixmap_private * pixmap_priv, glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
int repeat_type, int repeat_type,
glamor_pixmap_clipped_regions * clipped_regions, glamor_pixmap_clipped_regions *clipped_regions,
int *n_regions, int *need_clean_fbo) int *n_regions, int *need_clean_fbo)
{ {
BoxPtr temp_extent; BoxPtr temp_extent;
@ -954,7 +954,7 @@ glamor_get_transform_extent_from_box(struct pixman_box32 *box,
} }
static void static void
_glamor_process_transformed_clipped_region(glamor_pixmap_private * priv, _glamor_process_transformed_clipped_region(glamor_pixmap_private *priv,
int repeat_type, int repeat_type,
glamor_pixmap_clipped_regions * glamor_pixmap_clipped_regions *
clipped_regions, int *n_regions, clipped_regions, int *n_regions,
@ -1004,9 +1004,9 @@ glamor_composite_largepixmap_region(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
RegionPtr region, Bool force_clip, RegionPtr region, Bool force_clip,
INT16 x_source, INT16 x_source,
INT16 y_source, INT16 y_source,

2
glamor/glamor_picture.c
View File

@ -126,7 +126,7 @@ glamor_destroy_picture(PicturePtr picture)
void void
glamor_picture_format_fixup(PicturePtr picture, glamor_picture_format_fixup(PicturePtr picture,
glamor_pixmap_private * pixmap_priv) glamor_pixmap_private *pixmap_priv)
{ {
pixmap_priv->base.picture = picture; pixmap_priv->base.picture = picture;
} }

8
glamor/glamor_pixmap.c
View File

@ -63,7 +63,7 @@ glamor_pixmap_fini(ScreenPtr screen)
} }
void void
glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo * fbo, int x0, int y0, glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *fbo, int x0, int y0,
int width, int height) int width, int height)
{ {
glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv); glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv);
@ -81,7 +81,7 @@ glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo * fbo, int x0, int y0,
} }
void void
glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private * pixmap_priv) glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *pixmap_priv)
{ {
int w, h; int w, h;
@ -90,7 +90,7 @@ glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private * pixmap_priv)
} }
int int
glamor_set_destination_pixmap_priv(glamor_pixmap_private * pixmap_priv) glamor_set_destination_pixmap_priv(glamor_pixmap_private *pixmap_priv)
{ {
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
return -1; return -1;
@ -1226,7 +1226,7 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
/* fixup a fbo to the exact size as the pixmap. */ /* fixup a fbo to the exact size as the pixmap. */
/* XXX LARGE pixmap? */ /* XXX LARGE pixmap? */
Bool Bool
glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private * pixmap_priv) glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv)
{ {
glamor_pixmap_fbo *old_fbo; glamor_pixmap_fbo *old_fbo;
glamor_pixmap_fbo *new_fbo = NULL; glamor_pixmap_fbo *new_fbo = NULL;

6
glamor/glamor_polyops.c
View File

@ -57,7 +57,7 @@ glamor_poly_point_nf(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
static Bool static Bool
_glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, _glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg,
xSegment * pSeg, Bool fallback) xSegment *pSeg, Bool fallback)
{ {
if (!fallback && glamor_ddx_fallback_check_gc(pGC) if (!fallback && glamor_ddx_fallback_check_gc(pGC)
&& glamor_ddx_fallback_check_pixmap(pDrawable)) && glamor_ddx_fallback_check_pixmap(pDrawable))
@ -69,14 +69,14 @@ _glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg,
} }
void void
glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg) glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg)
{ {
_glamor_poly_segment(pDrawable, pGC, nseg, pSeg, TRUE); _glamor_poly_segment(pDrawable, pGC, nseg, pSeg, TRUE);
} }
Bool Bool
glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC, int nseg, glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC, int nseg,
xSegment * pSeg) xSegment *pSeg)
{ {
return _glamor_poly_segment(pDrawable, pGC, nseg, pSeg, FALSE); return _glamor_poly_segment(pDrawable, pGC, nseg, pSeg, FALSE);
} }

80
glamor/glamor_priv.h
View File

@ -511,7 +511,7 @@ glamor_get_screen_private(ScreenPtr screen)
} }
static inline void static inline void
glamor_set_screen_private(ScreenPtr screen, glamor_screen_private * priv) glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
{ {
dixSetPrivate(&screen->devPrivates, glamor_screen_private_key, priv); dixSetPrivate(&screen->devPrivates, glamor_screen_private_key, priv);
} }
@ -530,7 +530,7 @@ glamor_get_pixmap_private(PixmapPtr pixmap)
return priv; return priv;
} }
void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private * priv); void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv);
/** /**
* Returns TRUE if the given planemask covers all the significant bits in the * Returns TRUE if the given planemask covers all the significant bits in the
@ -552,23 +552,23 @@ Bool glamor_destroy_pixmap(PixmapPtr pixmap);
glamor_pixmap_fbo *glamor_pixmap_detach_fbo(glamor_pixmap_private * glamor_pixmap_fbo *glamor_pixmap_detach_fbo(glamor_pixmap_private *
pixmap_priv); pixmap_priv);
void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo * fbo); void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo);
glamor_pixmap_fbo *glamor_create_fbo_from_tex(glamor_screen_private * glamor_pixmap_fbo *glamor_create_fbo_from_tex(glamor_screen_private *
glamor_priv, int w, int h, glamor_priv, int w, int h,
GLenum format, GLint tex, GLenum format, GLint tex,
int flag); int flag);
glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private * glamor_priv, int w, glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv, int w,
int h, GLenum format, int flag); int h, GLenum format, int flag);
void glamor_destroy_fbo(glamor_pixmap_fbo * fbo); void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
void glamor_pixmap_destroy_fbo(glamor_pixmap_private * priv); void glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv);
void glamor_purge_fbo(glamor_pixmap_fbo * fbo); void glamor_purge_fbo(glamor_pixmap_fbo *fbo);
void glamor_init_pixmap_fbo(ScreenPtr screen); void glamor_init_pixmap_fbo(ScreenPtr screen);
void glamor_fini_pixmap_fbo(ScreenPtr screen); void glamor_fini_pixmap_fbo(ScreenPtr screen);
Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap); Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
void glamor_fbo_expire(glamor_screen_private * glamor_priv); void glamor_fbo_expire(glamor_screen_private *glamor_priv);
glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private * glamor_priv, glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private *glamor_priv,
int w, int h, GLenum format, int w, int h, GLenum format,
int flag, int block_w, int block_h, int flag, int block_w, int block_h,
glamor_pixmap_private *); glamor_pixmap_private *);
@ -603,20 +603,20 @@ Bool glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
unsigned char alu, unsigned long planemask, unsigned char alu, unsigned long planemask,
unsigned long fg_pixel, unsigned long bg_pixel, unsigned long fg_pixel, unsigned long bg_pixel,
int stipple_x, int stipple_y); int stipple_x, int stipple_y);
GLint glamor_compile_glsl_prog(glamor_gl_dispatch * dispatch, GLenum type, GLint glamor_compile_glsl_prog(glamor_gl_dispatch *dispatch, GLenum type,
const char *source); const char *source);
void glamor_link_glsl_prog(glamor_gl_dispatch * dispatch, GLint prog); void glamor_link_glsl_prog(glamor_gl_dispatch *dispatch, GLint prog);
void glamor_get_color_4f_from_pixel(PixmapPtr pixmap, void glamor_get_color_4f_from_pixel(PixmapPtr pixmap,
unsigned long fg_pixel, GLfloat * color); unsigned long fg_pixel, GLfloat *color);
int glamor_set_destination_pixmap(PixmapPtr pixmap); int glamor_set_destination_pixmap(PixmapPtr pixmap);
int glamor_set_destination_pixmap_priv(glamor_pixmap_private * pixmap_priv); int glamor_set_destination_pixmap_priv(glamor_pixmap_private *pixmap_priv);
void glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *, int, int, int, int); void glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *, int, int, int, int);
/* nc means no check. caller must ensure this pixmap has valid fbo. /* nc means no check. caller must ensure this pixmap has valid fbo.
* usually use the GLAMOR_PIXMAP_PRIV_HAS_FBO firstly. * usually use the GLAMOR_PIXMAP_PRIV_HAS_FBO firstly.
* */ * */
void glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private * pixmap_priv); void glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *pixmap_priv);
glamor_pixmap_fbo *glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, glamor_pixmap_fbo *glamor_es2_pixmap_read_prepare(PixmapPtr source, int x,
int y, int w, int h, int y, int w, int h,
@ -669,7 +669,7 @@ void glamor_glyphs(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
PictFormatPtr maskFormat, PictFormatPtr maskFormat,
INT16 xSrc, INT16 xSrc,
INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs); INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr *glyphs);
/* glamor_setspans.c */ /* glamor_setspans.c */
void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src, void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
@ -704,9 +704,9 @@ glamor_composite_clipped_region(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * soruce_pixmap_priv, glamor_pixmap_private *soruce_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
RegionPtr region, RegionPtr region,
int x_source, int x_source,
int y_source, int y_source,
@ -727,10 +727,10 @@ void glamor_fini_composite_shaders(ScreenPtr screen);
void glamor_composite_glyph_rects(CARD8 op, void glamor_composite_glyph_rects(CARD8 op,
PicturePtr src, PicturePtr mask, PicturePtr src, PicturePtr mask,
PicturePtr dst, int nrect, PicturePtr dst, int nrect,
glamor_composite_rect_t * rects); glamor_composite_rect_t *rects);
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);
void glamor_init_trapezoid_shader(ScreenPtr screen); void glamor_init_trapezoid_shader(ScreenPtr screen);
void glamor_fini_trapezoid_shader(ScreenPtr screen); void glamor_fini_trapezoid_shader(ScreenPtr screen);
PicturePtr glamor_convert_gradient_picture(ScreenPtr screen, PicturePtr glamor_convert_gradient_picture(ScreenPtr screen,
@ -742,19 +742,19 @@ Bool glamor_composite_choose_shader(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
struct shader_key *s_key, struct shader_key *s_key,
glamor_composite_shader ** shader, glamor_composite_shader ** shader,
struct blendinfo *op_info, struct blendinfo *op_info,
PictFormatShort * psaved_source_format); PictFormatShort *psaved_source_format);
void void
glamor_composite_set_shader_blend(glamor_pixmap_private * dest_priv, glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
struct shader_key *key, struct shader_key *key,
glamor_composite_shader * shader, glamor_composite_shader *shader,
struct blendinfo *op_info); struct blendinfo *op_info);
void glamor_setup_composite_vbo(ScreenPtr screen, int n_verts); void glamor_setup_composite_vbo(ScreenPtr screen, int n_verts);
@ -767,7 +767,7 @@ void glamor_emit_composite_vert(ScreenPtr screen,
void glamor_trapezoids(CARD8 op, void glamor_trapezoids(CARD8 op,
PicturePtr src, PicturePtr dst, PicturePtr src, PicturePtr dst,
PictFormatPtr mask_format, INT16 x_src, INT16 y_src, PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps); int ntrap, xTrapezoid *traps);
/* glamor_tile.c */ /* glamor_tile.c */
Bool glamor_tile(PixmapPtr pixmap, PixmapPtr tile, Bool glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
@ -865,19 +865,19 @@ glamor_put_sub_pixmap(PixmapPtr sub_pixmap, PixmapPtr pixmap, int x, int y,
int w, int h, glamor_access_t access); int w, int h, glamor_access_t access);
glamor_pixmap_clipped_regions glamor_pixmap_clipped_regions
*glamor_compute_clipped_regions(glamor_pixmap_private * priv, *glamor_compute_clipped_regions(glamor_pixmap_private *priv,
RegionPtr region, int *clipped_nbox, RegionPtr region, int *clipped_nbox,
int repeat_type, int reverse, int repeat_type, int reverse,
int upsidedown); int upsidedown);
glamor_pixmap_clipped_regions glamor_pixmap_clipped_regions
*glamor_compute_clipped_regions_ext(glamor_pixmap_private * pixmap_priv, *glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
RegionPtr region, int *n_region, RegionPtr region, int *n_region,
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_pixmap_clipped_regions
*glamor_compute_transform_clipped_regions(glamor_pixmap_private * priv, *glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
struct pixman_transform struct pixman_transform
*transform, RegionPtr region, *transform, RegionPtr region,
int *n_region, int dx, int dy, int *n_region, int dx, int dy,
@ -890,9 +890,9 @@ glamor_composite_largepixmap_region(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
RegionPtr region, Bool force_clip, RegionPtr region, Bool force_clip,
INT16 x_source, INT16 x_source,
INT16 y_source, INT16 y_source,
@ -949,12 +949,12 @@ void glamor_destroy_picture(PicturePtr picture);
/* fixup a fbo to the exact size as the pixmap. */ /* fixup a fbo to the exact size as the pixmap. */
Bool Bool
glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private * pixmap_priv); glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
void void
glamor_picture_format_fixup(PicturePtr picture, glamor_picture_format_fixup(PicturePtr picture,
glamor_pixmap_private * pixmap_priv); glamor_pixmap_private *pixmap_priv);
void void
@ -964,7 +964,7 @@ glamor_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
void void
glamor_add_traps(PicturePtr pPicture, glamor_add_traps(PicturePtr pPicture,
INT16 x_off, INT16 y_off, int ntrap, xTrap * traps); INT16 x_off, INT16 y_off, int ntrap, xTrap *traps);
RegionPtr RegionPtr
@ -976,13 +976,13 @@ void
glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr *ppci, pointer pglyphBase);
void void
glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph, int x, int y, unsigned int nglyph,
CharInfoPtr * ppci, pointer pglyphBase); CharInfoPtr *ppci, pointer pglyphBase);
void void
@ -997,7 +997,7 @@ glamor_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
void void
glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg,
xSegment * pSeg); xSegment *pSeg);
void void
@ -1008,7 +1008,7 @@ void
glamor_composite_rectangles(CARD8 op, glamor_composite_rectangles(CARD8 op,
PicturePtr dst, PicturePtr dst,
xRenderColor * color, xRenderColor *color,
int num_rects, xRectangle *rects); int num_rects, xRectangle *rects);
/* glamor_xv */ /* glamor_xv */

52
glamor/glamor_render.c
View File

@ -62,7 +62,7 @@ static struct blendinfo composite_op_info[] = {
#define RepeatFix 10 #define RepeatFix 10
static GLuint static GLuint
glamor_create_composite_fs(glamor_gl_dispatch * dispatch, glamor_create_composite_fs(glamor_gl_dispatch *dispatch,
struct shader_key *key) struct shader_key *key)
{ {
const char *repeat_define = const char *repeat_define =
@ -273,7 +273,7 @@ glamor_create_composite_fs(glamor_gl_dispatch * dispatch,
} }
static GLuint static GLuint
glamor_create_composite_vs(glamor_gl_dispatch * dispatch, glamor_create_composite_vs(glamor_gl_dispatch *dispatch,
struct shader_key *key) struct shader_key *key)
{ {
const char *main_opening = const char *main_opening =
@ -312,7 +312,7 @@ glamor_create_composite_vs(glamor_gl_dispatch * dispatch,
static void static void
glamor_create_composite_shader(ScreenPtr screen, struct shader_key *key, glamor_create_composite_shader(ScreenPtr screen, struct shader_key *key,
glamor_composite_shader * shader) glamor_composite_shader *shader)
{ {
GLuint vs, fs, prog; GLuint vs, fs, prog;
GLint source_sampler_uniform_location, mask_sampler_uniform_location; GLint source_sampler_uniform_location, mask_sampler_uniform_location;
@ -530,9 +530,9 @@ glamor_set_composite_op(ScreenPtr screen,
} }
static void static void
glamor_set_composite_texture(glamor_screen_private * glamor_priv, int unit, glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
PicturePtr picture, PicturePtr picture,
glamor_pixmap_private * pixmap_priv, glamor_pixmap_private *pixmap_priv,
GLuint wh_location, GLuint repeat_location) GLuint wh_location, GLuint repeat_location)
{ {
glamor_gl_dispatch *dispatch; glamor_gl_dispatch *dispatch;
@ -624,7 +624,7 @@ glamor_set_composite_texture(glamor_screen_private * glamor_priv, int unit,
} }
static void static void
glamor_set_composite_solid(glamor_gl_dispatch * dispatch, float *color, glamor_set_composite_solid(glamor_gl_dispatch *dispatch, float *color,
GLint uniform_location) GLint uniform_location)
{ {
dispatch->glUniform4fv(uniform_location, 1, color); dispatch->glUniform4fv(uniform_location, 1, color);
@ -924,7 +924,7 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
} }
static void static void
glamor_set_normalize_tcoords_generic(glamor_pixmap_private * priv, glamor_set_normalize_tcoords_generic(glamor_pixmap_private *priv,
int repeat_type, int repeat_type,
float *matrix, float *matrix,
float xscale, float yscale, float xscale, float yscale,
@ -961,13 +961,13 @@ glamor_composite_choose_shader(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
struct shader_key *s_key, struct shader_key *s_key,
glamor_composite_shader ** shader, glamor_composite_shader ** shader,
struct blendinfo *op_info, struct blendinfo *op_info,
PictFormatShort * psaved_source_format) PictFormatShort *psaved_source_format)
{ {
ScreenPtr screen = dest->pDrawable->pScreen; ScreenPtr screen = dest->pDrawable->pScreen;
PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap; PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap;
@ -1224,9 +1224,9 @@ glamor_composite_choose_shader(CARD8 op,
} }
void void
glamor_composite_set_shader_blend(glamor_pixmap_private * dest_priv, glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
struct shader_key *key, struct shader_key *key,
glamor_composite_shader * shader, glamor_composite_shader *shader,
struct blendinfo *op_info) struct blendinfo *op_info)
{ {
glamor_gl_dispatch *dispatch; glamor_gl_dispatch *dispatch;
@ -1279,10 +1279,10 @@ glamor_composite_with_shader(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
int nrect, glamor_composite_rect_t * rects, int nrect, glamor_composite_rect_t *rects,
Bool two_pass_ca) Bool two_pass_ca)
{ {
ScreenPtr screen = dest->pDrawable->pScreen; ScreenPtr screen = dest->pDrawable->pScreen;
@ -1540,9 +1540,9 @@ glamor_composite_clipped_region(CARD8 op,
PicturePtr source, PicturePtr source,
PicturePtr mask, PicturePtr mask,
PicturePtr dest, PicturePtr dest,
glamor_pixmap_private * source_pixmap_priv, glamor_pixmap_private *source_pixmap_priv,
glamor_pixmap_private * mask_pixmap_priv, glamor_pixmap_private *mask_pixmap_priv,
glamor_pixmap_private * dest_pixmap_priv, glamor_pixmap_private *dest_pixmap_priv,
RegionPtr region, RegionPtr region,
int x_source, int x_source,
int y_source, int y_source,
@ -1981,7 +1981,7 @@ glamor_composite_nf(CARD8 op,
static void static void
glamor_get_src_rect_extent(int nrect, glamor_get_src_rect_extent(int nrect,
glamor_composite_rect_t * rects, BoxPtr extent) glamor_composite_rect_t *rects, BoxPtr extent)
{ {
extent->x1 = MAXSHORT; extent->x1 = MAXSHORT;
extent->y1 = MAXSHORT; extent->y1 = MAXSHORT;
@ -2003,7 +2003,7 @@ glamor_get_src_rect_extent(int nrect,
static void static void
glamor_composite_src_rect_translate(int nrect, glamor_composite_src_rect_translate(int nrect,
glamor_composite_rect_t * rects, glamor_composite_rect_t *rects,
int x, int y) int x, int y)
{ {
while (nrect--) { while (nrect--) {
@ -2016,7 +2016,7 @@ glamor_composite_src_rect_translate(int nrect,
void void
glamor_composite_glyph_rects(CARD8 op, glamor_composite_glyph_rects(CARD8 op,
PicturePtr src, PicturePtr mask, PicturePtr dst, PicturePtr src, PicturePtr mask, PicturePtr dst,
int nrect, glamor_composite_rect_t * rects) int nrect, glamor_composite_rect_t *rects)
{ {
int n; int n;
PicturePtr temp_src = NULL; PicturePtr temp_src = NULL;
@ -2108,7 +2108,7 @@ glamor_composite_glyph_rects(CARD8 op,
static Bool static Bool
_glamor_composite_rects(CARD8 op, _glamor_composite_rects(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
xRenderColor * color, xRenderColor *color,
int nRect, xRectangle *rects, Bool fallback) int nRect, xRectangle *rects, Bool fallback)
{ {
miCompositeRects(op, pDst, color, nRect, rects); miCompositeRects(op, pDst, color, nRect, rects);
@ -2118,7 +2118,7 @@ _glamor_composite_rects(CARD8 op,
void void
glamor_composite_rects(CARD8 op, glamor_composite_rects(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
xRenderColor * color, int nRect, xRectangle *rects) xRenderColor *color, int nRect, xRectangle *rects)
{ {
_glamor_composite_rects(op, pDst, color, nRect, rects, TRUE); _glamor_composite_rects(op, pDst, color, nRect, rects, TRUE);
} }
@ -2126,7 +2126,7 @@ glamor_composite_rects(CARD8 op,
Bool Bool
glamor_composite_rects_nf(CARD8 op, glamor_composite_rects_nf(CARD8 op,
PicturePtr pDst, PicturePtr pDst,
xRenderColor * color, int nRect, xRectangle *rects) xRenderColor *color, int nRect, xRectangle *rects)
{ {
return _glamor_composite_rects(op, pDst, color, nRect, rects, FALSE); return _glamor_composite_rects(op, pDst, color, nRect, rects, FALSE);
} }

22
glamor/glamor_trapezoid.c
View File

@ -37,7 +37,7 @@
#include "fbpict.h" #include "fbpict.h"
static xFixed static xFixed
_glamor_linefixedX(xLineFixed * l, xFixed y, Bool ceil) _glamor_linefixedX(xLineFixed *l, xFixed y, Bool ceil)
{ {
xFixed dx = l->p2.x - l->p1.x; xFixed dx = l->p2.x - l->p1.x;
xFixed_32_32 ex = (xFixed_32_32) (y - l->p1.y) * dx; xFixed_32_32 ex = (xFixed_32_32) (y - l->p1.y) * dx;
@ -49,7 +49,7 @@ _glamor_linefixedX(xLineFixed * l, xFixed y, Bool ceil)
} }
static xFixed static xFixed
_glamor_linefixedY(xLineFixed * l, xFixed x, Bool ceil) _glamor_linefixedY(xLineFixed *l, xFixed x, Bool ceil)
{ {
xFixed dy = l->p2.y - l->p1.y; xFixed dy = l->p2.y - l->p1.y;
xFixed_32_32 ey = (xFixed_32_32) (x - l->p1.x) * dy; xFixed_32_32 ey = (xFixed_32_32) (x - l->p1.x) * dy;
@ -75,7 +75,7 @@ _glamor_linefixedY(xLineFixed * l, xFixed x, Bool ceil)
&& point[1] <= IntToxFixed(rect->y2)) && point[1] <= IntToxFixed(rect->y2))
static xFixed static xFixed
_glamor_lines_crossfixedY(xLineFixed * l, xLineFixed * r) _glamor_lines_crossfixedY(xLineFixed *l, xLineFixed *r)
{ {
xFixed dx1 = l->p2.x - l->p1.x; xFixed dx1 = l->p2.x - l->p1.x;
xFixed dx2 = r->p2.x - r->p1.x; xFixed dx2 = r->p2.x - r->p1.x;
@ -103,7 +103,7 @@ _glamor_lines_crossfixedY(xLineFixed * l, xLineFixed * r)
} }
static Bool static Bool
point_inside_trapezoid(int point[2], xTrapezoid * trap, xFixed cut_y) point_inside_trapezoid(int point[2], xTrapezoid *trap, xFixed cut_y)
{ {
int ret = TRUE; int ret = TRUE;
int tmp; int tmp;
@ -225,7 +225,7 @@ glamor_flush_composite_triangles(ScreenPtr screen)
} }
static Bool static Bool
_glamor_clip_trapezoid_vertex(xTrapezoid * trap, BoxPtr pbox, _glamor_clip_trapezoid_vertex(xTrapezoid *trap, BoxPtr pbox,
int vertex[6], int *num) int vertex[6], int *num)
{ {
xFixed edge_cross_y = 0xFFFFFFFF; xFixed edge_cross_y = 0xFFFFFFFF;
@ -1388,8 +1388,8 @@ glamor_fini_trapezoid_shader(ScreenPtr screen)
static Bool static Bool
_glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture, _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
xTrapezoid * traps, int ntrap, xTrapezoid *traps, int ntrap,
BoxRec * bounds) BoxRec *bounds)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch; glamor_gl_dispatch *dispatch;
@ -1642,7 +1642,7 @@ glamor_create_mask_picture(ScreenPtr screen,
} }
static int static int
_glamor_trapezoid_bounds(int ntrap, xTrapezoid * traps, BoxPtr box) _glamor_trapezoid_bounds(int ntrap, xTrapezoid *traps, BoxPtr box)
{ {
int has_large_trapezoid = 0; int has_large_trapezoid = 0;
@ -1695,7 +1695,7 @@ static Bool
_glamor_trapezoids(CARD8 op, _glamor_trapezoids(CARD8 op,
PicturePtr src, PicturePtr dst, PicturePtr src, PicturePtr dst,
PictFormatPtr mask_format, INT16 x_src, INT16 y_src, PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps, Bool fallback) int ntrap, xTrapezoid *traps, Bool fallback)
{ {
ScreenPtr screen = dst->pDrawable->pScreen; ScreenPtr screen = dst->pDrawable->pScreen;
BoxRec bounds; BoxRec bounds;
@ -1834,7 +1834,7 @@ void
glamor_trapezoids(CARD8 op, glamor_trapezoids(CARD8 op,
PicturePtr src, PicturePtr dst, PicturePtr src, PicturePtr dst,
PictFormatPtr mask_format, INT16 x_src, INT16 y_src, PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps) int ntrap, xTrapezoid *traps)
{ {
DEBUGF("x_src = %d, y_src = %d, ntrap = %d\n", x_src, y_src, ntrap); DEBUGF("x_src = %d, y_src = %d, ntrap = %d\n", x_src, y_src, ntrap);
@ -1846,7 +1846,7 @@ Bool
glamor_trapezoids_nf(CARD8 op, glamor_trapezoids_nf(CARD8 op,
PicturePtr src, PicturePtr dst, PicturePtr src, PicturePtr dst,
PictFormatPtr mask_format, INT16 x_src, INT16 y_src, PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
int ntrap, xTrapezoid * traps) int ntrap, xTrapezoid *traps)
{ {
DEBUGF("x_src = %d, y_src = %d, ntrap = %d\n", x_src, y_src, ntrap); DEBUGF("x_src = %d, y_src = %d, ntrap = %d\n", x_src, y_src, ntrap);

2
glamor/glamor_xv.c
View File

@ -271,7 +271,7 @@ static REF_TRANSFORM trans[2] = {
}; };
static void static void
glamor_display_textured_video(glamor_port_private * port_priv) glamor_display_textured_video(glamor_port_private *port_priv)
{ {
ScreenPtr screen = port_priv->pPixmap->drawable.pScreen; ScreenPtr screen = port_priv->pPixmap->drawable.pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);