hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into glamor-next

Browse source 
I've done this merge manually to resolve the minor conflict in glamor.c.

Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2014-07-17 18:00:44 -07:00
commit 6d49548849
62 changed files with 1706 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

74
mi/mi.h
View file

@ -270,22 +270,22 @@ extern _X_EXPORT void miPolyFillRect(DrawablePtr /*pDrawable */ ,
/* miglblt.c */
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ ,
GCPtr /*pGC */ ,
int /*x */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
void */*pglyphBase */
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
void *pglyphBase
);
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
GCPtr /*pGC */ ,
int /*x */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
void */*pglyphBase */
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
void *pglyphBase
);
/* mipoly.c */
@ -386,36 +386,36 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ ,
/* miscrinit.c */
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ ,
int /*width */ ,
int /*height */ ,
int /*depth */ ,
int /*bitsPerPixel */ ,
int /*devKind */ ,
void */*pPixData */
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
int bitsPerPixel,
int devKind,
void *pPixData
);
extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
);
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ ,
int /*width */ ,
void */*pbits */
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr pScreen,
int width,
void *pbits
);
extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ ,
void */*pbits */ ,
int /*xsize */ ,
int /*ysize */ ,
int /*dpix */ ,
int /*dpiy */ ,
int /*width */ ,
int /*rootDepth */ ,
int /*numDepths */ ,
DepthPtr /*depths */ ,
VisualID /*rootVisual */ ,
int /*numVisuals */ ,
VisualPtr /*visuals */
extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
void *pbits,
int xsize,
int ysize,
int dpix,
int dpiy,
int width,
int rootDepth,
int numDepths,
DepthPtr depths,
VisualID rootVisual,
int numVisuals,
VisualPtr visuals
);
/* mivaltree.c */