andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Convert use of the old "pointer" typedef to "void *".

Browse Source 
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-01-22 15:03:26 -08:00
parent 3c3a4eeaa1
commit 54e78ec31e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor.h
View File

@ -411,13 +411,13 @@ 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); void *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); void *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,
DrawablePtr pDrawable, int w, int h, DrawablePtr pDrawable, int w, int h,

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, void *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, void *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, void *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, void *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, void *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, void *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);

4
glamor/glamor_priv.h
View File

@ -925,11 +925,11 @@ RegionPtr glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
void glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, void 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, void *pglyphBase);
void glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, void 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, void *pglyphBase);
void glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap, void glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
DrawablePtr pDrawable, int w, int h, int x, int y); DrawablePtr pDrawable, int w, int h, int x, int y);

12
glamor/glamor_xv.c
View File

@ -154,7 +154,7 @@ static XF86ImageRec Images[NUM_IMAGES] = {
}; };
static void static void
glamor_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool cleanup) glamor_xv_stop_video(ScrnInfoPtr pScrn, void *data, Bool cleanup)
{ {
glamor_port_private *port_priv = (glamor_port_private *) data; glamor_port_private *port_priv = (glamor_port_private *) data;
int i; int i;
@ -172,7 +172,7 @@ glamor_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
static int static int
glamor_xv_set_port_attribute(ScrnInfoPtr pScrn, glamor_xv_set_port_attribute(ScrnInfoPtr pScrn,
Atom attribute, INT32 value, pointer data) Atom attribute, INT32 value, void *data)
{ {
glamor_port_private *port_priv = (glamor_port_private *) data; glamor_port_private *port_priv = (glamor_port_private *) data;
@ -195,7 +195,7 @@ glamor_xv_set_port_attribute(ScrnInfoPtr pScrn,
static int static int
glamor_xv_get_port_attribute(ScrnInfoPtr pScrn, glamor_xv_get_port_attribute(ScrnInfoPtr pScrn,
Atom attribute, INT32 *value, pointer data) Atom attribute, INT32 *value, void *data)
{ {
glamor_port_private *port_priv = (glamor_port_private *) data; glamor_port_private *port_priv = (glamor_port_private *) data;
@ -222,7 +222,7 @@ glamor_xv_query_best_size(ScrnInfoPtr pScrn,
Bool motion, Bool motion,
short vid_w, short vid_h, short vid_w, short vid_h,
short drw_w, short drw_h, short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h, pointer data) unsigned int *p_w, unsigned int *p_h, void *data)
{ {
*p_w = drw_w; *p_w = drw_w;
*p_h = drw_h; *p_h = drw_h;
@ -440,7 +440,7 @@ glamor_xv_put_image(ScrnInfoPtr pScrn,
short width, short width,
short height, short height,
Bool sync, Bool sync,
RegionPtr clipBoxes, pointer data, DrawablePtr pDrawable) RegionPtr clipBoxes, void *data, DrawablePtr pDrawable)
{ {
ScreenPtr screen = xf86ScrnToScreen(pScrn); ScreenPtr screen = xf86ScrnToScreen(pScrn);
glamor_port_private *port_priv = (glamor_port_private *) data; glamor_port_private *port_priv = (glamor_port_private *) data;
@ -622,7 +622,7 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports)
REGION_NULL(pScreen, &pPriv->clip); REGION_NULL(pScreen, &pPriv->clip);
adapt->pPortPrivates[i].ptr = (pointer) (pPriv); adapt->pPortPrivates[i].ptr = (void *) (pPriv);
} }
return adapt; return adapt;
} }