diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:24:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:24:56 +0200 |
| commit | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (patch) | |
| tree | 2a860c9d687826b3cb48facfa21c616e14e69347 /xorg-server/fb | |
| parent | edb5b380994125bf33929ef7dc5a3c456dfbe93b (diff) | |
| download | vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.tar.gz vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.tar.bz2 vcxsrv-d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed.zip | |
fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014
xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3
libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999
pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0
fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67
mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/fb/fbpict.c | 4 | ||||
| -rw-r--r-- | xorg-server/fb/fbpict.h | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am index 89f3babb1..752eabeb7 100644 --- a/xorg-server/fb/Makefile.am +++ b/xorg-server/fb/Makefile.am @@ -22,6 +22,7 @@ libfb_la_SOURCES = \ fbbits.h \ fbblt.c \ fbbltone.c \ + fbcmap_mi.c \ fbcopy.c \ fbfill.c \ fbfillrect.c \ @@ -50,5 +51,3 @@ libfb_la_SOURCES = \ fbwindow.c libwfb_la_SOURCES = $(libfb_la_SOURCES) - -EXTRA_DIST = fbcmap_mi.c diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c index b50385805..c2ee8a552 100644 --- a/xorg-server/fb/fbpict.c +++ b/xorg-server/fb/fbpict.c @@ -82,7 +82,7 @@ fbDestroyGlyphCache(void) } } -static void +void fbUnrealizeGlyph(ScreenPtr pScreen, GlyphPtr pGlyph) { @@ -90,7 +90,7 @@ fbUnrealizeGlyph(ScreenPtr pScreen, pixman_glyph_cache_remove (glyphCache, pGlyph, NULL); } -static void +void fbGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/xorg-server/fb/fbpict.h b/xorg-server/fb/fbpict.h index 110f32dfe..8b0f59f7a 100644 --- a/xorg-server/fb/fbpict.h +++ b/xorg-server/fb/fbpict.h @@ -65,11 +65,24 @@ fbTrapezoids(CARD8 op, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps); extern _X_EXPORT void - fbTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); +extern _X_EXPORT void +fbUnrealizeGlyph(ScreenPtr pScreen, + GlyphPtr pGlyph); + +extern _X_EXPORT void +fbGlyphs(CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, + INT16 ySrc, int nlist, + GlyphListPtr list, + GlyphPtr *glyphs); + #endif /* _FBPICT_H_ */ |