diff options
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/fb.h | 23 | ||||
| -rw-r--r-- | xorg-server/fb/fbcopy.c | 27 | ||||
| -rw-r--r-- | xorg-server/fb/fbpixmap.c | 12 | ||||
| -rw-r--r-- | xorg-server/fb/makefile | 37 | ||||
| -rw-r--r-- | xorg-server/fb/wfbrename.h | 2 |
5 files changed, 38 insertions, 63 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index b869d122c..248e9d86e 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -1133,29 +1133,6 @@ fbCopyNtoN(DrawablePtr pSrcDrawable, int dy, Bool reverse, Bool upsidedown, Pixel bitplane, void *closure); -/* Compatibility wrapper, to be removed at next ABI change. */ -extern _X_EXPORT void - -fbCopyRegion(DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - RegionPtr pDstRegion, - int dx, - int dy, fbCopyProc copyProc, Pixel bitPlane, void *closure); - -/* Compatibility wrapper, to be removed at next ABI change. */ -extern _X_EXPORT RegionPtr - -fbDoCopy(DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, - int yOut, fbCopyProc copyProc, Pixel bitplane, void *closure); - extern _X_EXPORT void fbCopy1toN(DrawablePtr pSrcDrawable, diff --git a/xorg-server/fb/fbcopy.c b/xorg-server/fb/fbcopy.c index e9c252a5e..541ef713b 100644 --- a/xorg-server/fb/fbcopy.c +++ b/xorg-server/fb/fbcopy.c @@ -28,33 +28,6 @@ #include "fb.h" -/* Compatibility wrapper, to be removed at next ABI change. */ -void -fbCopyRegion(DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - RegionPtr pDstRegion, - int dx, int dy, fbCopyProc copyProc, Pixel bitPlane, void *closure) -{ - miCopyRegion(pSrcDrawable, pDstDrawable, pGC, pDstRegion, dx, dy, copyProc, - bitPlane, closure); -} - -/* Compatibility wrapper, to be removed at next ABI change. */ -RegionPtr -fbDoCopy(DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - int xIn, - int yIn, - int widthSrc, - int heightSrc, - int xOut, int yOut, fbCopyProc copyProc, Pixel bitPlane, void *closure) -{ - return miDoCopy(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, widthSrc, - heightSrc, xOut, yOut, copyProc, bitPlane, closure); -} - void fbCopyNtoN(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c index fbcdca99c..ace078a00 100644 --- a/xorg-server/fb/fbpixmap.c +++ b/xorg-server/fb/fbpixmap.c @@ -300,24 +300,14 @@ fbPixmapToRegion(PixmapPtr pPix) #ifdef FB_DEBUG -#ifndef WIN32 #include <stdio.h> -#else -#include <dbg.h> -#endif static Bool fbValidateBits(FbStip * bits, int stride, FbStip data) { while (stride--) { if (*bits != data) { -#ifdef WIN32 - NCD_DEBUG((DEBUG_FAILURE, - "fdValidateBits failed at 0x%x (is 0x%x want 0x%x)", - bits, *bits, data)); -#else - fprintf(stderr, "fbValidateBits failed\n"); -#endif + fprintf (stderr, "fbValidateBits failed at 0x%x (is 0x%x want 0x%x)\n",bits, *bits, data); return FALSE; } bits++; diff --git a/xorg-server/fb/makefile b/xorg-server/fb/makefile new file mode 100644 index 000000000..717c07332 --- /dev/null +++ b/xorg-server/fb/makefile @@ -0,0 +1,37 @@ +
+LIBRARY=libfb
+
+CCFLAGS:=$(CCFLAGS:-RTCc=)
+
+
+CSRCS = \
+ fb24_32.c \
+ fballpriv.c \
+ fbarc.c \
+ fbbits.c \
+ fbblt.c \
+ fbbltone.c \
+ fbcopy.c \
+ fbfill.c \
+ fbfillrect.c \
+ fbfillsp.c \
+ fbgc.c \
+ fbgetsp.c \
+ fbglyph.c \
+ fbimage.c \
+ fbline.c \
+ fboverlay.c \
+ fbpict.c \
+ fbpixmap.c \
+ fbpoint.c \
+ fbpush.c \
+ fbscreen.c \
+ fbseg.c \
+ fbsetsp.c \
+ fbsolid.c \
+ fbstipple.c \
+ fbtile.c \
+ fbtrap.c \
+ fbutil.c \
+ fbwindow.c \
+ fbcmap_mi.c
diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h index 54d00d003..94efd03dd 100644 --- a/xorg-server/fb/wfbrename.h +++ b/xorg-server/fb/wfbrename.h @@ -44,7 +44,6 @@ #define fbCopyNto1 wfbCopyNto1 #define fbCopyNtoN wfbCopyNtoN #define fbCopyPlane wfbCopyPlane -#define fbCopyRegion wfbCopyRegion #define fbCopyWindow wfbCopyWindow #define fbCopyWindowProc wfbCopyWindowProc #define fbCreateDefColormap wfbCreateDefColormap @@ -55,7 +54,6 @@ #define fbDestroyGlyphCache wfbDestroyGlyphCache #define fbDestroyPixmap wfbDestroyPixmap #define fbDestroyWindow wfbDestroyWindow -#define fbDoCopy wfbDoCopy #define fbDots wfbDots #define fbDots16 wfbDots16 #define fbDots24 wfbDots24 |