aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/xaa
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xfree86/xaa')
-rw-r--r--xorg-server/hw/xfree86/xaa/Makefile.in35
-rw-r--r--xorg-server/hw/xfree86/xaa/xaa.h8
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaBitOrder.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaCpyArea.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaCpyWin.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaFillArc.c6
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaFillRect.c8
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaImage.c10
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaInit.c6
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaInitAccel.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaLineMisc.c6
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaOverlay.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaPCache.c23
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaPict.c20
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaSpans.c14
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaStipple.c8
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaTEGlyph.c8
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaTables.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaaWrapper.h2
-rw-r--r--xorg-server/hw/xfree86/xaa/xaalocal.h380
-rw-r--r--xorg-server/hw/xfree86/xaa/xaarop.h20
22 files changed, 301 insertions, 271 deletions
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.in b/xorg-server/hw/xfree86/xaa/Makefile.in
index e57a4e759..6d1bcbea8 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.in
+++ b/xorg-server/hw/xfree86/xaa/Makefile.in
@@ -39,8 +39,11 @@ subdir = hw/xfree86/xaa
DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+ $(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -50,7 +53,8 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
- $(top_builddir)/include/kdrive-config.h
+ $(top_builddir)/include/kdrive-config.h \
+ $(top_builddir)/include/version-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -123,6 +127,7 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
APPLE_APPLICATION_ID = @APPLE_APPLICATION_ID@
APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
@@ -143,9 +148,12 @@ CCASDEPMODE = @CCASDEPMODE@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
CYGPATH_W = @CYGPATH_W@
DARWIN_LIBS = @DARWIN_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -174,7 +182,9 @@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
DRIPROTO_LIBS = @DRIPROTO_LIBS@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_CFLAGS = @DRI_CFLAGS@
DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DRI_LIBS = @DRI_LIBS@
DSYMUTIL = @DSYMUTIL@
DTRACE = @DTRACE@
DUMPBIN = @DUMPBIN@
@@ -183,9 +193,13 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
GLX_DEFINES = @GLX_DEFINES@
GL_CFLAGS = @GL_CFLAGS@
@@ -224,12 +238,13 @@ LTCOMPILE = @LTCOMPILE@
LTCXXCOMPILE = @LTCXXCOMPILE@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAIN_LIB = @MAIN_LIB@
+MAKEFLAGS = @MAKEFLAGS@
MAKEINFO = @MAKEINFO@
MAKE_HTML = @MAKE_HTML@
MAKE_PDF = @MAKE_PDF@
MAKE_PS = @MAKE_PS@
MAKE_TEXT = @MAKE_TEXT@
-MESA_SOURCE = @MESA_SOURCE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
@@ -249,7 +264,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -259,6 +273,7 @@ PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PROJECTROOT = @PROJECTROOT@
PS2PDF = @PS2PDF@
+Q = @Q@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -272,11 +287,10 @@ STRIP = @STRIP@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
-VENDOR_NAME = @VENDOR_NAME@
+V = @V@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
-VENDOR_RELEASE = @VENDOR_RELEASE@
VERSION = @VERSION@
+WINDRES = @WINDRES@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
@@ -312,6 +326,7 @@ XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
XORG_SYS_LIBS = @XORG_SYS_LIBS@
XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
XPBPROXY_LIBS = @XPBPROXY_LIBS@
+XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
XSDL_INCS = @XSDL_INCS@
@@ -336,7 +351,6 @@ YFLAGS = @YFLAGS@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
-abi_font = @abi_font@
abi_videodrv = @abi_videodrv@
abi_xinput = @abi_xinput@
abs_builddir = @abs_builddir@
@@ -359,6 +373,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
driverdir = @driverdir@
dvidir = @dvidir@
@@ -390,7 +405,9 @@ psdir = @psdir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
srcdir = @srcdir@
+symbol_visibility = @symbol_visibility@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
diff --git a/xorg-server/hw/xfree86/xaa/xaa.h b/xorg-server/hw/xfree86/xaa/xaa.h
index d6ccc31e2..7db6b95d5 100644
--- a/xorg-server/hw/xfree86/xaa/xaa.h
+++ b/xorg-server/hw/xfree86/xaa/xaa.h
@@ -1379,22 +1379,22 @@ typedef struct _XAAInfoRec {
#define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE
-Bool
+extern _X_EXPORT Bool
XAAInit(
ScreenPtr pScreen,
XAAInfoRecPtr infoRec
);
-XAAInfoRecPtr XAACreateInfoRec(void);
+extern _X_EXPORT XAAInfoRecPtr XAACreateInfoRec(void);
-void
+extern _X_EXPORT void
XAADestroyInfoRec(
XAAInfoRecPtr infoRec
);
typedef void (*DepthChangeFuncPtr) (ScrnInfoPtr pScrn, int depth);
-Bool
+extern _X_EXPORT Bool
XAAInitDualFramebufferOverlay(
ScreenPtr pScreen,
DepthChangeFuncPtr callback
diff --git a/xorg-server/hw/xfree86/xaa/xaaBitOrder.c b/xorg-server/hw/xfree86/xaa/xaaBitOrder.c
index 9dbd00f3c..9b124670d 100644
--- a/xorg-server/hw/xfree86/xaa/xaaBitOrder.c
+++ b/xorg-server/hw/xfree86/xaa/xaaBitOrder.c
@@ -4,7 +4,7 @@
#endif
#include <X11/Xmd.h>
-CARD32 XAAReverseBitOrder(CARD32 v);
+#include "xaalocal.h"
CARD32
XAAReverseBitOrder(CARD32 v)
diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyArea.c b/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
index 6c991e100..6a898cd5f 100644
--- a/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyArea.c
@@ -252,7 +252,7 @@ XAADoImageRead(
}
-void
+void
XAAScreenToScreenBitBlt(
ScrnInfoPtr pScrn,
int nbox,
diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyWin.c b/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
index ecdc9a3be..31c421e65 100644
--- a/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyWin.c
@@ -21,7 +21,7 @@
Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
*/
-void
+void
XAACopyWindow(
WindowPtr pWin,
DDXPointRec ptOldOrg,
diff --git a/xorg-server/hw/xfree86/xaa/xaaFillArc.c b/xorg-server/hw/xfree86/xaa/xaaFillArc.c
index d3ebc22fc..d83922ce0 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFillArc.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFillArc.c
@@ -161,11 +161,7 @@ XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc)
void
-XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs)
- DrawablePtr pDraw;
- GCPtr pGC;
- int narcs;
- xArc *parcs;
+XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
register xArc *arc;
register int i;
diff --git a/xorg-server/hw/xfree86/xaa/xaaFillRect.c b/xorg-server/hw/xfree86/xaa/xaaFillRect.c
index 55a30bbd6..0b83ef3ee 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFillRect.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFillRect.c
@@ -587,7 +587,7 @@ XAAFillColor8x8PatternRects(
| Cache Blits |
\***************/
-void
+void
XAAFillCacheBltRects(
ScrnInfoPtr pScrn,
int rop,
@@ -709,7 +709,7 @@ XAAFillCacheBltRects(
-void
+void
XAAFillCacheExpandRects(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -812,7 +812,7 @@ WriteColumn(
src = pSrc + (yoff * srcwidth);
- dwords = ((w * Bpp) + 3) >> 2;
+ dwords = bytes_to_int32(w * Bpp);
if((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) &&
((dwords * h) & 0x01)) {
@@ -873,7 +873,7 @@ WriteColumn(
}
}
-void
+void
XAAFillImageWriteRects(
ScrnInfoPtr pScrn,
int rop,
diff --git a/xorg-server/hw/xfree86/xaa/xaaImage.c b/xorg-server/hw/xfree86/xaa/xaaImage.c
index 910c7e1e2..4933beea3 100644
--- a/xorg-server/hw/xfree86/xaa/xaaImage.c
+++ b/xorg-server/hw/xfree86/xaa/xaaImage.c
@@ -92,7 +92,7 @@ XAAWritePixmap32To24(
int trans
){
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
- int count, dwords = ((w * 3) + 3) >> 2;
+ int count, dwords = bytes_to_int32(w * 3);
CARD32 *src, *dst;
Bool PlusOne = FALSE;
@@ -172,7 +172,7 @@ XAAWritePixmap32To24(
}
-void
+void
XAAWritePixmap (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -227,7 +227,7 @@ XAAWritePixmap (
BAD_ALIGNMENT:
- dwords = ((w * Bpp) + 3) >> 2;
+ dwords = bytes_to_int32(w * Bpp);
if((infoRec->ImageWriteFlags & CPU_TRANSFER_PAD_QWORD) &&
((dwords * h) & 0x01)) {
@@ -305,7 +305,7 @@ BAD_ALIGNMENT:
}
-void
+void
XAAWritePixmapScanline (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -351,7 +351,7 @@ XAAWritePixmapScanline (
BAD_ALIGNMENT:
- dwords = ((w * Bpp) + 3) >> 2;
+ dwords = bytes_to_int32(w * Bpp);
(*infoRec->SetupForScanlineImageWrite)(
pScrn, rop, planemask, trans, bpp, depth);
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index 8d3833e5a..2ce2d9085 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -65,7 +65,7 @@ DevPrivateKey XAAGetPixmapKey(void) {
static Bool SwitchedOut = FALSE;
XAAInfoRecPtr
-XAACreateInfoRec()
+XAACreateInfoRec(void)
{
XAAInfoRecPtr infoRec;
@@ -76,7 +76,7 @@ XAACreateInfoRec()
return infoRec;
}
-void
+void
XAADestroyInfoRec(XAAInfoRecPtr infoRec)
{
if(!infoRec) return;
@@ -94,7 +94,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
}
-Bool
+Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
diff --git a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
index 3b397dc4a..157325e4b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
@@ -528,7 +528,9 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
- xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
+ xf86ReturnOptValBool(options,
+ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE,
+ FALSE))
{
XAAMSG("\tOffscreen Pixmaps\n");
} else {
diff --git a/xorg-server/hw/xfree86/xaa/xaaLineMisc.c b/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
index cefb59a8e..6cef4bcd5 100644
--- a/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
+++ b/xorg-server/hw/xfree86/xaa/xaaLineMisc.c
@@ -15,7 +15,7 @@
#include "xaalocal.h"
-void
+void
XAASolidHorVertLineAsRects(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
@@ -29,7 +29,7 @@ XAASolidHorVertLineAsRects(
}
-void
+void
XAASolidHorVertLineAsTwoPoint(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
@@ -44,7 +44,7 @@ XAASolidHorVertLineAsTwoPoint(
(*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x, y + len, 0);
}
-void
+void
XAASolidHorVertLineAsBresenham(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
diff --git a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
index 556650fb0..7431ba2a0 100644
--- a/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/xorg-server/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -37,7 +37,7 @@
/* if the backing rectangle and text are of the same dimensions
then we can draw in one pass */
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAANonTEGlyphRenderer3)(
#else
@@ -90,7 +90,7 @@ EXPNAME(XAANonTEGlyphRenderer)(
#ifndef FIXEDBASE
/* Scanline version of above gets built for LSBFIRST and MSBFIRST */
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAANonTEGlyphRendererScanline3)(
#else
diff --git a/xorg-server/hw/xfree86/xaa/xaaOverlay.c b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
index 273183e10..2956a3dbf 100644
--- a/xorg-server/hw/xfree86/xaa/xaaOverlay.c
+++ b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
@@ -112,7 +112,7 @@ XAASetColorKey8_32(
SET_SYNC_FLAG(infoRec);
}
-void
+void
XAASetupOverlay8_32Planar(ScreenPtr pScreen)
{
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
diff --git a/xorg-server/hw/xfree86/xaa/xaaPCache.c b/xorg-server/hw/xfree86/xaa/xaaPCache.c
index d05aaf22c..7e3011bd5 100644
--- a/xorg-server/hw/xfree86/xaa/xaaPCache.c
+++ b/xorg-server/hw/xfree86/xaa/xaaPCache.c
@@ -630,7 +630,7 @@ GOT_EM:
}
-void
+void
XAAInitPixmapCache(
ScreenPtr pScreen,
RegionPtr areas,
@@ -1556,7 +1556,7 @@ XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
} else funcNo = 2;
pad = BitmapBytePad(pCache->w * bpp);
- dwords = pad >> 2;
+ dwords = bytes_to_int32(pad);
dstPtr = data = (unsigned char*)xalloc(pad * pCache->h);
srcPtr = (unsigned char*)pPix->devPrivate.ptr;
@@ -1658,7 +1658,10 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
}
XAACachePlanarMonoStippleProc
-XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; }
+XAAGetCachePlanarMonoStipple(void)
+{
+ return XAACachePlanarMonoStipple;
+}
XAACacheInfoPtr
XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
@@ -1840,7 +1843,7 @@ XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
}
-void
+void
XAAWriteBitmapToCache(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1854,7 +1857,7 @@ XAAWriteBitmapToCache(
0, fg, bg, GXcopy, ~0);
}
-void
+void
XAAWriteBitmapToCacheLinear(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1892,7 +1895,7 @@ XAAWriteBitmapToCacheLinear(
}
-void
+void
XAAWritePixmapToCache(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1908,7 +1911,7 @@ XAAWritePixmapToCache(
-void
+void
XAAWritePixmapToCacheLinear(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1952,7 +1955,7 @@ XAAWritePixmapToCacheLinear(
}
-void
+void
XAAWriteMono8x8PatternToCache(
ScrnInfoPtr pScrn,
XAACacheInfoPtr pCache
@@ -1994,7 +1997,7 @@ XAAWriteMono8x8PatternToCache(
xfree(data);
}
-void
+void
XAAWriteColor8x8PatternToCache(
ScrnInfoPtr pScrn,
PixmapPtr pPix,
@@ -2323,7 +2326,7 @@ static int RotateMasksY[4] = {
0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF
};
-void
+void
XAARotateMonoPattern(
int *pat0, int *pat1,
int xorg, int yorg,
diff --git a/xorg-server/hw/xfree86/xaa/xaaPict.c b/xorg-server/hw/xfree86/xaa/xaaPict.c
index 784c649a4..e059d3d65 100644
--- a/xorg-server/hw/xfree86/xaa/xaaPict.c
+++ b/xorg-server/hw/xfree86/xaa/xaaPict.c
@@ -75,12 +75,18 @@ XAAGetPixelFromRGBA (
gshift = bbits;
rshift = gshift + gbits;
ashift = rshift + rbits;
- } else { /* PICT_TYPE_ABGR */
+ } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
rshift = 0;
gshift = rbits;
bshift = gshift + gbits;
ashift = bshift + bbits;
- }
+ } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
+ bshift = PICT_FORMAT_BPP(format) - bbits;
+ gshift = bshift - gbits;
+ rshift = gshift - rbits;
+ ashift = 0;
+ } else
+ return FALSE;
*pixel |= ( blue >> (16 - bbits)) << bshift;
*pixel |= ( red >> (16 - rbits)) << rshift;
@@ -116,12 +122,18 @@ XAAGetRGBAFromPixel(
gshift = bbits;
rshift = gshift + gbits;
ashift = rshift + rbits;
- } else { /* PICT_TYPE_ABGR */
+ } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
rshift = 0;
gshift = rbits;
bshift = gshift + gbits;
ashift = bshift + bbits;
- }
+ } else if(PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
+ bshift = PICT_FORMAT_BPP(format) - bbits;
+ gshift = bshift - gbits;
+ rshift = gshift - rbits;
+ ashift = 0;
+ } else
+ return FALSE;
*red = ((pixel >> rshift ) & ((1 << rbits) - 1)) << (16 - rbits);
while(rbits < 16) {
diff --git a/xorg-server/hw/xfree86/xaa/xaaSpans.c b/xorg-server/hw/xfree86/xaa/xaaSpans.c
index 7d0943d72..46d6d0740 100644
--- a/xorg-server/hw/xfree86/xaa/xaaSpans.c
+++ b/xorg-server/hw/xfree86/xaa/xaaSpans.c
@@ -396,7 +396,7 @@ XAARenderPixmapCopySpans(
\****************/
-void
+void
XAAFillSolidSpans(
ScrnInfoPtr pScrn,
int fg, int rop,
@@ -432,7 +432,7 @@ XAAFillSolidSpans(
\***************/
-void
+void
XAAFillMono8x8PatternSpansScreenOrigin(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -491,7 +491,7 @@ XAAFillMono8x8PatternSpansScreenOrigin(
}
-void
+void
XAAFillMono8x8PatternSpans(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -559,7 +559,7 @@ XAAFillMono8x8PatternSpans(
\****************/
-void
+void
XAAFillColor8x8PatternSpansScreenOrigin(
ScrnInfoPtr pScrn,
int rop,
@@ -605,7 +605,7 @@ XAAFillColor8x8PatternSpansScreenOrigin(
}
-void
+void
XAAFillColor8x8PatternSpans(
ScrnInfoPtr pScrn,
int rop,
@@ -654,7 +654,7 @@ XAAFillColor8x8PatternSpans(
\*****************/
-void
+void
XAAFillCacheBltSpans(
ScrnInfoPtr pScrn,
int rop,
@@ -713,7 +713,7 @@ XAAFillCacheBltSpans(
\****************/
-void
+void
XAAFillCacheExpandSpans(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
diff --git a/xorg-server/hw/xfree86/xaa/xaaStipple.c b/xorg-server/hw/xfree86/xaa/xaaStipple.c
index 0dd8e9fcf..c1d6f8ab4 100644
--- a/xorg-server/hw/xfree86/xaa/xaaStipple.c
+++ b/xorg-server/hw/xfree86/xaa/xaaStipple.c
@@ -105,7 +105,7 @@ unsigned int XAAShiftMasks[32] = {
#endif
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAAFillColorExpandRects3)(
#else
@@ -241,7 +241,7 @@ SECOND_PASS:
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAAFillColorExpandSpans3)(
#else
@@ -352,7 +352,7 @@ SECOND_PASS:
#ifndef FIXEDBASE
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAAFillScanlineColorExpandRects3)(
#else
@@ -465,7 +465,7 @@ SECOND_PASS:
SET_SYNC_FLAG(infoRec);
}
-void
+void
#ifdef TRIPLE_BITS
EXPNAME(XAAFillScanlineColorExpandSpans3)(
#else
diff --git a/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
index cb60266ea..41e638e5c 100644
--- a/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/xorg-server/hw/xfree86/xaa/xaaTEGlyph.c
@@ -143,7 +143,7 @@ GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {
/* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not.
A total of 4 versions */
-void
+void
EXPNAME(XAATEGlyphRenderer)(
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -239,7 +239,7 @@ THE_END:
********************************************************************/
-void
+void
EXPNAME(XAATEGlyphRenderer3)(
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -340,7 +340,7 @@ THE_END:
#ifndef FIXEDBASE
/* Scanline version of above gets built for LSBFIRST and MSBFIRST */
-void
+void
EXPNAME(XAATEGlyphRendererScanline)(
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -415,7 +415,7 @@ THE_END:
SET_SYNC_FLAG(infoRec);
}
-void
+void
EXPNAME(XAATEGlyphRendererScanline3)(
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
diff --git a/xorg-server/hw/xfree86/xaa/xaaTables.c b/xorg-server/hw/xfree86/xaa/xaaTables.c
index 829527dd6..c7fa28af3 100644
--- a/xorg-server/hw/xfree86/xaa/xaaTables.c
+++ b/xorg-server/hw/xfree86/xaa/xaaTables.c
@@ -1,4 +1,4 @@
-
+#include "xaalocal.h"
/*
* This is a table of 24-bit values, indexed with an 8-bit byte value, then
* expands each bit to three consecutive bits. This is required for color
diff --git a/xorg-server/hw/xfree86/xaa/xaaWrapper.h b/xorg-server/hw/xfree86/xaa/xaaWrapper.h
index a141d8421..f554741c6 100644
--- a/xorg-server/hw/xfree86/xaa/xaaWrapper.h
+++ b/xorg-server/hw/xfree86/xaa/xaaWrapper.h
@@ -4,7 +4,7 @@
typedef void (*SyncFunc)(ScreenPtr);
-Bool xaaSetupWrapper(ScreenPtr pScreen,
+extern _X_EXPORT Bool xaaSetupWrapper(ScreenPtr pScreen,
XAAInfoRecPtr infoPtr, int depth, SyncFunc *func);
#endif
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h
index 69a59050c..5e3d373c6 100644
--- a/xorg-server/hw/xfree86/xaa/xaalocal.h
+++ b/xorg-server/hw/xfree86/xaa/xaalocal.h
@@ -97,18 +97,18 @@ typedef struct _XAAPixmap {
} XAAPixmapRec, *XAAPixmapPtr;
-Bool
+extern _X_EXPORT Bool
XAACreateGC(
GCPtr pGC
);
-Bool
+extern _X_EXPORT Bool
XAAInitAccel(
ScreenPtr pScreen,
XAAInfoRecPtr infoRec
);
-RegionPtr
+extern _X_EXPORT RegionPtr
XAABitBlt(
DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
@@ -123,7 +123,7 @@ XAABitBlt(
unsigned long bitPlane
);
-void
+extern _X_EXPORT void
XAAScreenToScreenBitBlt(
ScrnInfoPtr pScrn,
int nbox,
@@ -135,7 +135,7 @@ XAAScreenToScreenBitBlt(
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAADoBitBlt(
DrawablePtr pSrc,
DrawablePtr pDst,
@@ -144,7 +144,7 @@ XAADoBitBlt(
DDXPointPtr pptSrc
);
-void
+extern _X_EXPORT void
XAADoImageWrite(
DrawablePtr pSrc,
DrawablePtr pDst,
@@ -153,7 +153,7 @@ XAADoImageWrite(
DDXPointPtr pptSrc
);
-void
+extern _X_EXPORT void
XAADoImageRead(
DrawablePtr pSrc,
DrawablePtr pDst,
@@ -162,7 +162,7 @@ XAADoImageRead(
DDXPointPtr pptSrc
);
-void
+extern _X_EXPORT void
XAACopyWindow(
WindowPtr pWin,
DDXPointRec ptOldOrg,
@@ -170,7 +170,7 @@ XAACopyWindow(
);
-RegionPtr
+extern _X_EXPORT RegionPtr
XAACopyArea(
DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
@@ -183,56 +183,56 @@ XAACopyArea(
int dsty
);
-void
+extern _X_EXPORT void
XAAValidateCopyArea(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidatePutImage(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidateCopyPlane(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidatePushPixels(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidateFillSpans(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidatePolyGlyphBlt(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidateImageGlyphBlt(
GCPtr pGC,
unsigned long changes,
DrawablePtr pDraw
);
-void
+extern _X_EXPORT void
XAAValidatePolylines(
GCPtr pGC,
unsigned long changes,
@@ -240,7 +240,7 @@ XAAValidatePolylines(
);
-RegionPtr
+extern _X_EXPORT RegionPtr
XAACopyPlaneColorExpansion(
DrawablePtr pSrc,
DrawablePtr pDst,
@@ -255,7 +255,7 @@ XAACopyPlaneColorExpansion(
);
-void
+extern _X_EXPORT void
XAAPushPixelsSolidColorExpansion(
GCPtr pGC,
PixmapPtr pBitMap,
@@ -266,7 +266,7 @@ XAAPushPixelsSolidColorExpansion(
int yOrg
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpandMSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -278,7 +278,7 @@ XAAWriteBitmapColorExpandMSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpand3MSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -290,7 +290,7 @@ XAAWriteBitmapColorExpand3MSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpandMSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -302,7 +302,7 @@ XAAWriteBitmapColorExpandMSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpand3MSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -314,7 +314,7 @@ XAAWriteBitmapColorExpand3MSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpandLSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -326,7 +326,7 @@ XAAWriteBitmapColorExpandLSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpand3LSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -338,7 +338,7 @@ XAAWriteBitmapColorExpand3LSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpandLSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -350,7 +350,7 @@ XAAWriteBitmapColorExpandLSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapColorExpand3LSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -363,7 +363,7 @@ XAAWriteBitmapColorExpand3LSBFirst (
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpandMSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -375,7 +375,7 @@ XAAWriteBitmapScanlineColorExpandMSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpand3MSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -387,7 +387,7 @@ XAAWriteBitmapScanlineColorExpand3MSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -399,7 +399,7 @@ XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -411,7 +411,7 @@ XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpandLSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -423,7 +423,7 @@ XAAWriteBitmapScanlineColorExpandLSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpand3LSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -435,7 +435,7 @@ XAAWriteBitmapScanlineColorExpand3LSBFirst (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -447,7 +447,7 @@ XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -459,7 +459,7 @@ XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase (
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAWritePixmap (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -471,7 +471,7 @@ XAAWritePixmap (
int bpp, int depth
);
-void
+extern _X_EXPORT void
XAAWritePixmapScanline (
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -486,7 +486,7 @@ XAAWritePixmapScanline (
typedef void (*ClipAndRenderRectsFunc)(GCPtr, int, BoxPtr, int, int);
-void
+extern _X_EXPORT void
XAAClipAndRenderRects(
GCPtr pGC,
ClipAndRenderRectsFunc func,
@@ -499,7 +499,7 @@ XAAClipAndRenderRects(
typedef void (*ClipAndRenderSpansFunc)(GCPtr, int, DDXPointPtr, int*,
int, int, int);
-void
+extern _X_EXPORT void
XAAClipAndRenderSpans(
GCPtr pGC,
DDXPointPtr ppt,
@@ -512,7 +512,7 @@ XAAClipAndRenderSpans(
);
-void
+extern _X_EXPORT void
XAAFillSolidRects(
ScrnInfoPtr pScrn,
int fg, int rop,
@@ -521,7 +521,7 @@ XAAFillSolidRects(
BoxPtr pBox
);
-void
+extern _X_EXPORT void
XAAFillMono8x8PatternRects(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -532,7 +532,7 @@ XAAFillMono8x8PatternRects(
int xorg, int yorg
);
-void
+extern _X_EXPORT void
XAAFillMono8x8PatternRectsScreenOrigin(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -544,7 +544,7 @@ XAAFillMono8x8PatternRectsScreenOrigin(
);
-void
+extern _X_EXPORT void
XAAFillColor8x8PatternRectsScreenOrigin(
ScrnInfoPtr pScrn,
int rop,
@@ -555,7 +555,7 @@ XAAFillColor8x8PatternRectsScreenOrigin(
XAACacheInfoPtr pCache
);
-void
+extern _X_EXPORT void
XAAFillColor8x8PatternRects(
ScrnInfoPtr pScrn,
int rop,
@@ -566,7 +566,7 @@ XAAFillColor8x8PatternRects(
XAACacheInfoPtr pCache
);
-void
+extern _X_EXPORT void
XAAFillCacheBltRects(
ScrnInfoPtr pScrn,
int rop,
@@ -577,7 +577,7 @@ XAAFillCacheBltRects(
XAACacheInfoPtr pCache
);
-void
+extern _X_EXPORT void
XAAFillCacheExpandRects(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -588,7 +588,7 @@ XAAFillCacheExpandRects(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillImageWriteRects(
ScrnInfoPtr pScrn,
int rop,
@@ -599,7 +599,7 @@ XAAFillImageWriteRects(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAPolyFillRect(
DrawablePtr pDraw,
GCPtr pGC,
@@ -608,7 +608,7 @@ XAAPolyFillRect(
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererMSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -616,7 +616,7 @@ XAATEGlyphRendererMSBFirstFixedBase (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRenderer3MSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -624,7 +624,7 @@ XAATEGlyphRenderer3MSBFirstFixedBase (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererMSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -632,7 +632,7 @@ XAATEGlyphRendererMSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRenderer3MSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -640,7 +640,7 @@ XAATEGlyphRenderer3MSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererLSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -649,7 +649,7 @@ XAATEGlyphRendererLSBFirstFixedBase (
);
-void
+extern _X_EXPORT void
XAATEGlyphRenderer3LSBFirstFixedBase (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -657,7 +657,7 @@ XAATEGlyphRenderer3LSBFirstFixedBase (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererLSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -665,7 +665,7 @@ XAATEGlyphRendererLSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRenderer3LSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -674,7 +674,7 @@ XAATEGlyphRenderer3LSBFirst (
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererScanlineMSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -682,7 +682,7 @@ XAATEGlyphRendererScanlineMSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererScanline3MSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -690,7 +690,7 @@ XAATEGlyphRendererScanline3MSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererScanlineLSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -698,7 +698,7 @@ XAATEGlyphRendererScanlineLSBFirst (
int fg, int bg, int rop, unsigned planemask
);
-void
+extern _X_EXPORT void
XAATEGlyphRendererScanline3LSBFirst (
ScrnInfoPtr pScrn,
int x, int y, int w, int h, int skipleft, int startline,
@@ -707,28 +707,28 @@ XAATEGlyphRendererScanline3LSBFirst (
);
-extern CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32])(
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32])(
CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
);
-extern CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32])(
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32])(
CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
);
-extern CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32])(
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32])(
CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
);
-extern CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])(
+extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])(
CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
);
-GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void);
-GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void);
-GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void);
-GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void);
+extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void);
+extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void);
+extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void);
+extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void);
-void
+extern _X_EXPORT void
XAAFillColorExpandRectsLSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -739,7 +739,7 @@ XAAFillColorExpandRectsLSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRects3LSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -750,7 +750,7 @@ XAAFillColorExpandRects3LSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRectsLSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -761,7 +761,7 @@ XAAFillColorExpandRectsLSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRects3LSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -772,7 +772,7 @@ XAAFillColorExpandRects3LSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRectsMSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -783,7 +783,7 @@ XAAFillColorExpandRectsMSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRects3MSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -794,7 +794,7 @@ XAAFillColorExpandRects3MSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRectsMSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -805,7 +805,7 @@ XAAFillColorExpandRectsMSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandRects3MSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -816,7 +816,7 @@ XAAFillColorExpandRects3MSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandRectsLSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -827,7 +827,7 @@ XAAFillScanlineColorExpandRectsLSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandRects3LSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -838,7 +838,7 @@ XAAFillScanlineColorExpandRects3LSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandRectsMSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -849,7 +849,7 @@ XAAFillScanlineColorExpandRectsMSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandRects3MSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -860,7 +860,7 @@ XAAFillScanlineColorExpandRects3MSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpansLSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -873,7 +873,7 @@ XAAFillColorExpandSpansLSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpans3LSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -886,7 +886,7 @@ XAAFillColorExpandSpans3LSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpansLSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -899,7 +899,7 @@ XAAFillColorExpandSpansLSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpans3LSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -912,7 +912,7 @@ XAAFillColorExpandSpans3LSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpansMSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -925,7 +925,7 @@ XAAFillColorExpandSpansMSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpans3MSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -938,7 +938,7 @@ XAAFillColorExpandSpans3MSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpansMSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -951,7 +951,7 @@ XAAFillColorExpandSpansMSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillColorExpandSpans3MSBFirstFixedBase(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -964,7 +964,7 @@ XAAFillColorExpandSpans3MSBFirstFixedBase(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandSpansLSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -977,7 +977,7 @@ XAAFillScanlineColorExpandSpansLSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandSpans3LSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -990,7 +990,7 @@ XAAFillScanlineColorExpandSpans3LSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAPutImage(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1004,7 +1004,7 @@ XAAPutImage(
char *pImage
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandSpansMSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -1017,7 +1017,7 @@ XAAFillScanlineColorExpandSpansMSBFirst(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillScanlineColorExpandSpans3MSBFirst(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -1031,32 +1031,32 @@ XAAFillScanlineColorExpandSpans3MSBFirst(
);
-extern CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])(
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])(
CARD32* base, CARD32* src, int offset, int width, int dwords
);
-extern CARD32 *(*XAAStippleScanlineFuncMSBFirst[6])(
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirst[6])(
CARD32* base, CARD32* src, int offset, int width, int dwords
);
-extern CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6])(
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6])(
CARD32* base, CARD32* src, int offset, int width, int dwords
);
-extern CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])(
+extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])(
CARD32* base, CARD32* src, int offset, int width, int dwords
);
-StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirst(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void);
-StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirst(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void);
+extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirst(void);
-int
+extern _X_EXPORT int
XAAPolyText8TEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1065,7 +1065,7 @@ XAAPolyText8TEColorExpansion(
char *chars
);
-int
+extern _X_EXPORT int
XAAPolyText16TEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1074,7 +1074,7 @@ XAAPolyText16TEColorExpansion(
unsigned short *chars
);
-void
+extern _X_EXPORT void
XAAImageText8TEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1083,7 +1083,7 @@ XAAImageText8TEColorExpansion(
char *chars
);
-void
+extern _X_EXPORT void
XAAImageText16TEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1092,7 +1092,7 @@ XAAImageText16TEColorExpansion(
unsigned short *chars
);
-void
+extern _X_EXPORT void
XAAImageGlyphBltTEColorExpansion(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1102,7 +1102,7 @@ XAAImageGlyphBltTEColorExpansion(
pointer pglyphBase
);
-void
+extern _X_EXPORT void
XAAPolyGlyphBltTEColorExpansion(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1113,7 +1113,7 @@ XAAPolyGlyphBltTEColorExpansion(
);
-int
+extern _X_EXPORT int
XAAPolyText8NonTEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1122,7 +1122,7 @@ XAAPolyText8NonTEColorExpansion(
char *chars
);
-int
+extern _X_EXPORT int
XAAPolyText16NonTEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1131,7 +1131,7 @@ XAAPolyText16NonTEColorExpansion(
unsigned short *chars
);
-void
+extern _X_EXPORT void
XAAImageText8NonTEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1140,7 +1140,7 @@ XAAImageText8NonTEColorExpansion(
char *chars
);
-void
+extern _X_EXPORT void
XAAImageText16NonTEColorExpansion(
DrawablePtr pDraw,
GCPtr pGC,
@@ -1149,7 +1149,7 @@ XAAImageText16NonTEColorExpansion(
unsigned short *chars
);
-void
+extern _X_EXPORT void
XAAImageGlyphBltNonTEColorExpansion(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1159,7 +1159,7 @@ XAAImageGlyphBltNonTEColorExpansion(
pointer pglyphBase
);
-void
+extern _X_EXPORT void
XAAPolyGlyphBltNonTEColorExpansion(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1170,7 +1170,7 @@ XAAPolyGlyphBltNonTEColorExpansion(
);
-void XAANonTEGlyphRenderer(
+extern _X_EXPORT void XAANonTEGlyphRenderer(
ScrnInfoPtr pScrn,
int x, int y, int n,
NonTEGlyphPtr glyphs,
@@ -1179,7 +1179,7 @@ void XAANonTEGlyphRenderer(
unsigned int planemask
);
-void
+extern _X_EXPORT void
XAAFillSolidSpans(
ScrnInfoPtr pScrn,
int fg, int rop,
@@ -1189,7 +1189,7 @@ XAAFillSolidSpans(
int *pwidth, int fSorted
);
-void
+extern _X_EXPORT void
XAAFillMono8x8PatternSpans(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -1201,7 +1201,7 @@ XAAFillMono8x8PatternSpans(
int xorg, int yorg
);
-void
+extern _X_EXPORT void
XAAFillMono8x8PatternSpansScreenOrigin(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -1213,7 +1213,7 @@ XAAFillMono8x8PatternSpansScreenOrigin(
int xorg, int yorg
);
-void
+extern _X_EXPORT void
XAAFillColor8x8PatternSpansScreenOrigin(
ScrnInfoPtr pScrn,
int rop,
@@ -1225,7 +1225,7 @@ XAAFillColor8x8PatternSpansScreenOrigin(
int xorigin, int yorigin
);
-void
+extern _X_EXPORT void
XAAFillColor8x8PatternSpans(
ScrnInfoPtr pScrn,
int rop,
@@ -1237,7 +1237,7 @@ XAAFillColor8x8PatternSpans(
int xorigin, int yorigin
);
-void
+extern _X_EXPORT void
XAAFillCacheBltSpans(
ScrnInfoPtr pScrn,
int rop,
@@ -1250,7 +1250,7 @@ XAAFillCacheBltSpans(
int xorg, int yorg
);
-void
+extern _X_EXPORT void
XAAFillCacheExpandSpans(
ScrnInfoPtr pScrn,
int fg, int bg, int rop,
@@ -1263,7 +1263,7 @@ XAAFillCacheExpandSpans(
PixmapPtr pPix
);
-void
+extern _X_EXPORT void
XAAFillSpans(
DrawablePtr pDrawable,
GC *pGC,
@@ -1274,14 +1274,14 @@ XAAFillSpans(
);
-void
+extern _X_EXPORT void
XAAInitPixmapCache(
ScreenPtr pScreen,
RegionPtr areas,
pointer data
);
-void
+extern _X_EXPORT void
XAAWriteBitmapToCache(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1290,7 +1290,7 @@ XAAWriteBitmapToCache(
int fg, int bg
);
-void
+extern _X_EXPORT void
XAAWriteBitmapToCacheLinear(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1299,7 +1299,7 @@ XAAWriteBitmapToCacheLinear(
int fg, int bg
);
-void
+extern _X_EXPORT void
XAAWritePixmapToCache(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1308,7 +1308,7 @@ XAAWritePixmapToCache(
int bpp, int depth
);
-void
+extern _X_EXPORT void
XAAWritePixmapToCacheLinear(
ScrnInfoPtr pScrn,
int x, int y, int w, int h,
@@ -1317,26 +1317,26 @@ XAAWritePixmapToCacheLinear(
int bpp, int depth
);
-void
+extern _X_EXPORT void
XAASolidHorVertLineAsRects(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
);
-void
+extern _X_EXPORT void
XAASolidHorVertLineAsTwoPoint(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
);
-void
+extern _X_EXPORT void
XAASolidHorVertLineAsBresenham(
ScrnInfoPtr pScrn,
int x, int y, int len, int dir
);
-void
+extern _X_EXPORT void
XAAPolyRectangleThinSolid(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1345,7 +1345,7 @@ XAAPolyRectangleThinSolid(
);
-void
+extern _X_EXPORT void
XAAPolylinesWideSolid (
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1354,7 +1354,7 @@ XAAPolylinesWideSolid (
DDXPointPtr pPts
);
-void
+extern _X_EXPORT void
XAAFillPolygonSolid(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1364,7 +1364,7 @@ XAAFillPolygonSolid(
DDXPointPtr ptsIn
);
-void
+extern _X_EXPORT void
XAAFillPolygonStippled(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1375,7 +1375,7 @@ XAAFillPolygonStippled(
);
-void
+extern _X_EXPORT void
XAAFillPolygonTiled(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1386,7 +1386,7 @@ XAAFillPolygonTiled(
);
-int
+extern _X_EXPORT int
XAAIsEasyPolygon(
DDXPointPtr ptsIn,
int count,
@@ -1397,7 +1397,7 @@ XAAIsEasyPolygon(
int shape
);
-void
+extern _X_EXPORT void
XAAFillPolygonHelper(
ScrnInfoPtr pScrn,
DDXPointPtr ptsIn,
@@ -1413,7 +1413,7 @@ XAAFillPolygonHelper(
XAACacheInfoPtr pCache
);
-void
+extern _X_EXPORT void
XAAPolySegment(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1421,7 +1421,7 @@ XAAPolySegment(
xSegment *pSeg
);
-void
+extern _X_EXPORT void
XAAPolyLines(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1430,7 +1430,7 @@ XAAPolyLines(
DDXPointPtr pptInit
);
-void
+extern _X_EXPORT void
XAAPolySegmentDashed(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1438,7 +1438,7 @@ XAAPolySegmentDashed(
xSegment *pSeg
);
-void
+extern _X_EXPORT void
XAAPolyLinesDashed(
DrawablePtr pDrawable,
GCPtr pGC,
@@ -1448,44 +1448,44 @@ XAAPolyLinesDashed(
);
-void
+extern _X_EXPORT void
XAAWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache);
-void
+extern _X_EXPORT void
XAAWriteColor8x8PatternToCache(
ScrnInfoPtr pScrn,
PixmapPtr pPix,
XAACacheInfoPtr pCache
);
-void
+extern _X_EXPORT void
XAARotateMonoPattern(
int *pat0, int *pat1,
int xoffset, int yoffset,
Bool msbfirst
);
-void XAAComputeDash(GCPtr pGC);
+extern _X_EXPORT void XAAComputeDash(GCPtr pGC);
-void XAAMoveDWORDS_FixedBase(
+extern _X_EXPORT void XAAMoveDWORDS_FixedBase(
register CARD32* dest,
register CARD32* src,
register int dwords
);
-void XAAMoveDWORDS_FixedSrc(
+extern _X_EXPORT void XAAMoveDWORDS_FixedSrc(
register CARD32* dest,
register CARD32* src,
register int dwords
);
-void XAAMoveDWORDS(
+extern _X_EXPORT void XAAMoveDWORDS(
register CARD32* dest,
register CARD32* src,
register int dwords
);
-int
+extern _X_EXPORT int
XAAGetRectClipBoxes(
GCPtr pGC,
BoxPtr pboxClippedBase,
@@ -1493,54 +1493,54 @@ XAAGetRectClipBoxes(
xRectangle *prectInit
);
-void
+extern _X_EXPORT void
XAASetupOverlay8_32Planar(ScreenPtr);
-void
+extern _X_EXPORT void
XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACacheTile(ScrnInfoPtr Scrn, PixmapPtr pPix);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACachePlanarMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
typedef XAACacheInfoPtr (*XAACachePlanarMonoStippleProc)(ScrnInfoPtr, PixmapPtr);
-XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void);
+extern _X_EXPORT XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACacheStipple(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACacheMono8x8Pattern(ScrnInfoPtr Scrn, int pat0, int pat1);
-XAACacheInfoPtr
+extern _X_EXPORT XAACacheInfoPtr
XAACacheColor8x8Pattern(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg);
-void
+extern _X_EXPORT void
XAATileCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h);
-void XAAClosePixmapCache(ScreenPtr pScreen);
+extern _X_EXPORT void XAAClosePixmapCache(ScreenPtr pScreen);
void XAAInvalidatePixmapCache(ScreenPtr pScreen);
-Bool XAACheckStippleReducibility(PixmapPtr pPixmap);
-Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono);
+extern _X_EXPORT Bool XAACheckStippleReducibility(PixmapPtr pPixmap);
+extern _X_EXPORT Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono);
-int XAAStippledFillChooser(GCPtr pGC);
-int XAAOpaqueStippledFillChooser(GCPtr pGC);
-int XAATiledFillChooser(GCPtr pGC);
+extern _X_EXPORT int XAAStippledFillChooser(GCPtr pGC);
+extern _X_EXPORT int XAAOpaqueStippledFillChooser(GCPtr pGC);
+extern _X_EXPORT int XAATiledFillChooser(GCPtr pGC);
-void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen);
-void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen);
-void XAARemoveAreaCallback(FBAreaPtr area);
-void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
-Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
+extern _X_EXPORT void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen);
+extern _X_EXPORT void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen);
+extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area);
+extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
+extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
#ifdef RENDER
-void
+extern _X_EXPORT void
XAAComposite (CARD8 op,
PicturePtr pSrc,
PicturePtr pMask,
@@ -1555,7 +1555,7 @@ XAAComposite (CARD8 op,
CARD16 height);
-Bool
+extern _X_EXPORT Bool
XAADoComposite (CARD8 op,
PicturePtr pSrc,
PicturePtr pMask,
@@ -1570,7 +1570,7 @@ XAADoComposite (CARD8 op,
CARD16 height);
-void
+extern _X_EXPORT void
XAAGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -1581,7 +1581,7 @@ XAAGlyphs (CARD8 op,
GlyphListPtr list,
GlyphPtr *glyphs);
-Bool
+extern _X_EXPORT Bool
XAADoGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -1595,7 +1595,7 @@ XAADoGlyphs (CARD8 op,
/* helpers */
-void
+extern _X_EXPORT void
XAA_888_plus_PICT_a8_to_8888 (
CARD32 color,
CARD8 *alphaPtr, /* in bytes */
@@ -1606,7 +1606,7 @@ XAA_888_plus_PICT_a8_to_8888 (
int height
);
-Bool
+extern _X_EXPORT Bool
XAAGetRGBAFromPixel(
CARD32 pixel,
CARD16 *red,
@@ -1617,7 +1617,7 @@ XAAGetRGBAFromPixel(
);
-Bool
+extern _X_EXPORT Bool
XAAGetPixelFromRGBA (
CARD32 *pixel,
CARD16 red,
@@ -1630,18 +1630,18 @@ XAAGetPixelFromRGBA (
#endif
/* XXX should be static */
-extern GCOps XAAFallbackOps;
-extern GCOps *XAAGetFallbackOps(void);
-extern GCFuncs XAAGCFuncs;
-extern DevPrivateKey XAAGetScreenKey(void);
-extern DevPrivateKey XAAGetGCKey(void);
-extern DevPrivateKey XAAGetPixmapKey(void);
+extern _X_EXPORT GCOps XAAFallbackOps;
+extern _X_EXPORT GCOps *XAAGetFallbackOps(void);
+extern _X_EXPORT GCFuncs XAAGCFuncs;
+extern _X_EXPORT DevPrivateKey XAAGetScreenKey(void);
+extern _X_EXPORT DevPrivateKey XAAGetGCKey(void);
+extern _X_EXPORT DevPrivateKey XAAGetPixmapKey(void);
-extern unsigned int XAAShiftMasks[32];
+extern _X_EXPORT unsigned int XAAShiftMasks[32];
-extern unsigned int byte_expand3[256], byte_reversed_expand3[256];
+extern _X_EXPORT unsigned int byte_expand3[256], byte_reversed_expand3[256];
-CARD32 XAAReverseBitOrder(CARD32 data);
+extern _X_EXPORT CARD32 XAAReverseBitOrder(CARD32 data);
#define GET_XAASCREENPTR_FROM_SCREEN(pScreen)\
dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey())
diff --git a/xorg-server/hw/xfree86/xaa/xaarop.h b/xorg-server/hw/xfree86/xaa/xaarop.h
index 548993c49..edfd75aec 100644
--- a/xorg-server/hw/xfree86/xaa/xaarop.h
+++ b/xorg-server/hw/xfree86/xaa/xaarop.h
@@ -294,18 +294,18 @@
#define NO_SRC_ROP(rop) \
((rop == GXnoop) || (rop == GXset) || (rop == GXclear) || (rop == GXinvert))
-int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop);
-int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop);
+extern _X_EXPORT int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop);
+extern _X_EXPORT int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop);
/* XXX These four should be static, but it breaks the 6.7.0 ABI. */
-extern int XAACopyROP[16];
-extern int XAACopyROP_PM[16];
-extern int XAAPatternROP[16];
-extern int XAAPatternROP_PM[16];
+extern _X_EXPORT int XAACopyROP[16];
+extern _X_EXPORT int XAACopyROP_PM[16];
+extern _X_EXPORT int XAAPatternROP[16];
+extern _X_EXPORT int XAAPatternROP_PM[16];
-extern int XAAGetCopyROP(int i);
-extern int XAAGetCopyROP_PM(int i);
-extern int XAAGetPatternROP(int i);
-extern int XAAGetPatternROP_PM(int i);
+extern _X_EXPORT int XAAGetCopyROP(int i);
+extern _X_EXPORT int XAAGetCopyROP_PM(int i);
+extern _X_EXPORT int XAAGetPatternROP(int i);
+extern _X_EXPORT int XAAGetPatternROP_PM(int i);
#endif /* _XAAROP_H */