From 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 3 Dec 2008 05:43:34 -0200 Subject: Rework symbol visibility for easier maintenance Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it). --- render/animcur.c | 4 +- render/filter.c | 18 ++++----- render/glyph.c | 38 +++++++++--------- render/glyphstr.h | 32 +++++++-------- render/matrix.c | 8 ++-- render/miindex.c | 6 +-- render/mipict.c | 28 ++++++------- render/mipict.h | 58 +++++++++++++------------- render/mirect.c | 2 +- render/mitrap.c | 6 +-- render/mitri.c | 10 ++--- render/picture.c | 80 ++++++++++++++++++------------------ render/picture.h | 8 ++-- render/picturestr.h | 114 ++++++++++++++++++++++++++-------------------------- render/render.c | 10 ++--- render/renderedge.c | 10 ++--- render/renderedge.h | 10 ++--- 17 files changed, 221 insertions(+), 221 deletions(-) (limited to 'render') diff --git a/render/animcur.c b/render/animcur.c index c15149220..d80094d98 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -345,7 +345,7 @@ AnimCurRecolorCursor (DeviceIntPtr pDev, Wrap (as, pScreen, RecolorCursor, AnimCurRecolorCursor); } -_X_EXPORT Bool +Bool AnimCurInit (ScreenPtr pScreen) { AnimCurScreenPtr as; @@ -378,7 +378,7 @@ AnimCurInit (ScreenPtr pScreen) return TRUE; } -_X_EXPORT int +int AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid) { CursorPtr pCursor; diff --git a/render/filter.c b/render/filter.c index fa9f986da..89cc0646a 100644 --- a/render/filter.c +++ b/render/filter.c @@ -46,7 +46,7 @@ static int nfilterNames; * standard but not required filters don't have constant indices */ -_X_EXPORT int +int PictureGetFilterId (char *filter, int len, Bool makeit) { int i; @@ -102,7 +102,7 @@ PictureSetDefaultIds (void) return TRUE; } -_X_EXPORT char * +char * PictureGetFilterName (int id) { if (0 <= id && id < nfilterNames) @@ -123,7 +123,7 @@ PictureFreeFilterIds (void) filterNames = 0; } -_X_EXPORT int +int PictureAddFilter (ScreenPtr pScreen, char *filter, PictFilterValidateParamsProcPtr ValidateParams, @@ -159,7 +159,7 @@ PictureAddFilter (ScreenPtr pScreen, return id; } -_X_EXPORT Bool +Bool PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -193,7 +193,7 @@ PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias) return TRUE; } -_X_EXPORT PictFilterPtr +PictFilterPtr PictureFindFilter (ScreenPtr pScreen, char *name, int len) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -244,7 +244,7 @@ convolutionFilterValidateParams (ScreenPtr pScreen, } -_X_EXPORT Bool +Bool PictureSetDefaultFilters (ScreenPtr pScreen) { if (!filterNames) @@ -268,7 +268,7 @@ PictureSetDefaultFilters (ScreenPtr pScreen) return TRUE; } -_X_EXPORT void +void PictureResetFilters (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -278,7 +278,7 @@ PictureResetFilters (ScreenPtr pScreen) PictureFreeFilterIds (); } -_X_EXPORT int +int SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int nparams) { PictFilterPtr pFilter; @@ -312,7 +312,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int return SetPicturePictFilter (pPicture, pFilter, params, nparams); } -_X_EXPORT int +int SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter, xFixed *params, int nparams) { diff --git a/render/glyph.c b/render/glyph.c index 36d073f80..7c044aada 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -96,7 +96,7 @@ FreeGlyphPrivates (GlyphPtr glyph) glyph->devPrivates = NULL; } -_X_EXPORT void +void GlyphUninit (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen (pScreen); @@ -129,7 +129,7 @@ GlyphUninit (ScreenPtr pScreen) } } -_X_EXPORT GlyphHashSetPtr +GlyphHashSetPtr FindGlyphHashSet (CARD32 filled) { int i; @@ -140,7 +140,7 @@ FindGlyphHashSet (CARD32 filled) return 0; } -_X_EXPORT GlyphRefPtr +GlyphRefPtr FindGlyphRef (GlyphHashPtr hash, CARD32 signature, Bool match, @@ -192,7 +192,7 @@ FindGlyphRef (GlyphHashPtr hash, return gr; } -_X_EXPORT int +int HashGlyph (xGlyphInfo *gi, CARD8 *bits, unsigned long size, @@ -229,7 +229,7 @@ HashGlyph (xGlyphInfo *gi, return Success; } -_X_EXPORT GlyphPtr +GlyphPtr FindGlyphByHash (unsigned char sha1[20], int format) { GlyphRefPtr gr; @@ -272,7 +272,7 @@ CheckDuplicates (GlyphHashPtr hash, char *where) #define DuplicateRef(a,b) #endif -_X_EXPORT void +void FreeGlyph (GlyphPtr glyph, int format) { CheckDuplicates (&globalGlyphs[format], "FreeGlyph"); @@ -321,7 +321,7 @@ FreeGlyph (GlyphPtr glyph, int format) } } -_X_EXPORT void +void AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) { GlyphRefPtr gr; @@ -366,7 +366,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom"); } -_X_EXPORT Bool +Bool DeleteGlyph (GlyphSetPtr glyphSet, Glyph id) { GlyphRefPtr gr; @@ -384,7 +384,7 @@ DeleteGlyph (GlyphSetPtr glyphSet, Glyph id) return FALSE; } -_X_EXPORT GlyphPtr +GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id) { GlyphPtr glyph; @@ -395,7 +395,7 @@ FindGlyph (GlyphSetPtr glyphSet, Glyph id) return glyph; } -_X_EXPORT GlyphPtr +GlyphPtr AllocateGlyph (xGlyphInfo *gi, int fdepth) { PictureScreenPtr ps; @@ -438,7 +438,7 @@ bail: return 0; } -_X_EXPORT Bool +Bool AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet) { hash->table = xcalloc (hashSet->size, sizeof (GlyphRefRec)); @@ -449,7 +449,7 @@ AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet) return TRUE; } -_X_EXPORT Bool +Bool ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) { CARD32 tableEntries; @@ -492,14 +492,14 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) return TRUE; } -_X_EXPORT Bool +Bool ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change) { return (ResizeGlyphHash (&glyphSet->hash, change, FALSE) && ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], change, TRUE)); } -_X_EXPORT GlyphSetPtr +GlyphSetPtr AllocateGlyphSet (int fdepth, PictFormatPtr format) { GlyphSetPtr glyphSet; @@ -527,7 +527,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format) return glyphSet; } -_X_EXPORT int +int FreeGlyphSet (pointer value, XID gid) { @@ -614,7 +614,7 @@ GlyphExtents (int nlist, #define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) -_X_EXPORT void +void CompositeGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -632,20 +632,20 @@ CompositeGlyphs (CARD8 op, (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, lists, glyphs); } -_X_EXPORT Bool +Bool miRealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph) { return TRUE; } -_X_EXPORT void +void miUnrealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph) { } -_X_EXPORT void +void miGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/render/glyphstr.h b/render/glyphstr.h index 67b21fe63..6c1a837e0 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -91,58 +91,58 @@ typedef struct _GlyphList { PictFormatPtr format; } GlyphListRec, *GlyphListPtr; -GlyphHashSetPtr +extern _X_EXPORT GlyphHashSetPtr FindGlyphHashSet (CARD32 filled); -void +extern _X_EXPORT void GlyphUninit (ScreenPtr pScreen); -GlyphHashSetPtr +extern _X_EXPORT GlyphHashSetPtr FindGlyphHashSet (CARD32 filled); -GlyphRefPtr +extern _X_EXPORT GlyphRefPtr FindGlyphRef (GlyphHashPtr hash, CARD32 signature, Bool match, unsigned char sha1[20]); -GlyphPtr +extern _X_EXPORT GlyphPtr FindGlyphByHash (unsigned char sha1[20], int format); -int +extern _X_EXPORT int HashGlyph (xGlyphInfo *gi, CARD8 *bits, unsigned long size, unsigned char sha1[20]); -void +extern _X_EXPORT void FreeGlyph (GlyphPtr glyph, int format); -void +extern _X_EXPORT void AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id); -Bool +extern _X_EXPORT Bool DeleteGlyph (GlyphSetPtr glyphSet, Glyph id); -GlyphPtr +extern _X_EXPORT GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id); -GlyphPtr +extern _X_EXPORT GlyphPtr AllocateGlyph (xGlyphInfo *gi, int format); -Bool +extern _X_EXPORT Bool AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet); -Bool +extern _X_EXPORT Bool ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global); -Bool +extern _X_EXPORT Bool ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change); -GlyphSetPtr +extern _X_EXPORT GlyphSetPtr AllocateGlyphSet (int fdepth, PictFormatPtr format); -int +extern _X_EXPORT int FreeGlyphSet (pointer value, XID gid); diff --git a/render/matrix.c b/render/matrix.c index 3b55eb989..eccb90270 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -39,7 +39,7 @@ #include "servermd.h" #include "picturestr.h" -_X_EXPORT void +void PictTransform_from_xRenderTransform (PictTransformPtr pict, xRenderTransform *render) { @@ -56,7 +56,7 @@ PictTransform_from_xRenderTransform (PictTransformPtr pict, pict->matrix[2][2] = render->matrix33; } -_X_EXPORT void +void xRenderTransform_from_PictTransform (xRenderTransform *render, PictTransformPtr pict) { @@ -73,14 +73,14 @@ xRenderTransform_from_PictTransform (xRenderTransform *render, render->matrix33 = pict->matrix[2][2]; } -_X_EXPORT Bool +Bool PictureTransformPoint (PictTransformPtr transform, PictVectorPtr vector) { return pixman_transform_point(transform, vector); } -_X_EXPORT Bool +Bool PictureTransformPoint3d (PictTransformPtr transform, PictVectorPtr vector) { diff --git a/render/miindex.c b/render/miindex.c index 41052693d..4e0cf0084 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -232,7 +232,7 @@ FindBestGray (miIndexedPtr pIndexed, Pixel *pixels, int num, int gray) return best; } -_X_EXPORT Bool +Bool miInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat) { @@ -318,7 +318,7 @@ miInitIndexed (ScreenPtr pScreen, return TRUE; } -_X_EXPORT void +void miCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat) { @@ -334,7 +334,7 @@ miCloseIndexed (ScreenPtr pScreen, } } -_X_EXPORT void +void miUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, diff --git a/render/mipict.c b/render/mipict.c index abb6239ce..777f111e5 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -37,20 +37,20 @@ #define __inline #endif -_X_EXPORT int +int miCreatePicture (PicturePtr pPicture) { return Success; } -_X_EXPORT void +void miDestroyPicture (PicturePtr pPicture) { if (pPicture->freeCompClip) REGION_DESTROY(pPicture->pDrawable->pScreen, pPicture->pCompositeClip); } -_X_EXPORT void +void miDestroyPictureClip (PicturePtr pPicture) { switch (pPicture->clientClipType) { @@ -71,7 +71,7 @@ miDestroyPictureClip (PicturePtr pPicture) pPicture->clientClipType = CT_NONE; } -_X_EXPORT int +int miChangePictureClip (PicturePtr pPicture, int type, pointer value, @@ -116,14 +116,14 @@ miChangePictureClip (PicturePtr pPicture, return Success; } -_X_EXPORT void +void miChangePicture (PicturePtr pPicture, Mask mask) { return; } -_X_EXPORT void +void miValidatePicture (PicturePtr pPicture, Mask mask) { @@ -248,14 +248,14 @@ miValidatePicture (PicturePtr pPicture, } } -_X_EXPORT int +int miChangePictureTransform (PicturePtr pPicture, PictTransform *transform) { return Success; } -_X_EXPORT int +int miChangePictureFilter (PicturePtr pPicture, int filter, xFixed *params, @@ -341,7 +341,7 @@ miClipPictureSrc (RegionPtr pRegion, } } -_X_EXPORT void +void miCompositeSourceValidate (PicturePtr pPicture, INT16 x, INT16 y, @@ -403,7 +403,7 @@ miCompositeSourceValidate (PicturePtr pPicture, * an allocation failure, but rendering ignores those anyways. */ -_X_EXPORT Bool +Bool miComputeCompositeRegion (RegionPtr pRegion, PicturePtr pSrc, PicturePtr pMask, @@ -494,7 +494,7 @@ miComputeCompositeRegion (RegionPtr pRegion, return TRUE; } -_X_EXPORT void +void miRenderColorToPixel (PictFormatPtr format, xRenderColor *color, CARD32 *pixel) @@ -545,7 +545,7 @@ miFillColor (CARD32 pixel, int bits) return (CARD16) pixel; } -_X_EXPORT Bool +Bool miIsSolidAlpha (PicturePtr pSrc) { ScreenPtr pScreen; @@ -579,7 +579,7 @@ miIsSolidAlpha (PicturePtr pSrc) } } -_X_EXPORT void +void miRenderPixelToColor (PictFormatPtr format, CARD32 pixel, xRenderColor *color) @@ -612,7 +612,7 @@ miRenderPixelToColor (PictFormatPtr format, } } -_X_EXPORT Bool +Bool miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { PictureScreenPtr ps; diff --git a/render/mipict.h b/render/mipict.h index b3d4bae6f..eb6b6645d 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -47,46 +47,46 @@ typedef struct _miIndexed { #define miIndexToEntY24(mif,rgb24) ((mif)->ent[CvtR8G8B8toY15(rgb24)]) -int +extern _X_EXPORT int miCreatePicture (PicturePtr pPicture); -void +extern _X_EXPORT void miDestroyPicture (PicturePtr pPicture); -void +extern _X_EXPORT void miDestroyPictureClip (PicturePtr pPicture); -int +extern _X_EXPORT int miChangePictureClip (PicturePtr pPicture, int type, pointer value, int n); -void +extern _X_EXPORT void miChangePicture (PicturePtr pPicture, Mask mask); -void +extern _X_EXPORT void miValidatePicture (PicturePtr pPicture, Mask mask); -int +extern _X_EXPORT int miChangePictureTransform (PicturePtr pPicture, PictTransform *transform); -int +extern _X_EXPORT int miChangePictureFilter (PicturePtr pPicture, int filter, xFixed *params, int nparams); -void +extern _X_EXPORT void miCompositeSourceValidate (PicturePtr pPicture, INT16 x, INT16 y, CARD16 width, CARD16 height); -Bool +extern _X_EXPORT Bool miComputeCompositeRegion (RegionPtr pRegion, PicturePtr pSrc, PicturePtr pMask, @@ -100,18 +100,18 @@ miComputeCompositeRegion (RegionPtr pRegion, CARD16 width, CARD16 height); -Bool +extern _X_EXPORT Bool miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); -Bool +extern _X_EXPORT Bool miRealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph); -void +extern _X_EXPORT void miUnrealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph); -void +extern _X_EXPORT void miGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -122,30 +122,30 @@ miGlyphs (CARD8 op, GlyphListPtr list, GlyphPtr *glyphs); -void +extern _X_EXPORT void miRenderColorToPixel (PictFormatPtr pPict, xRenderColor *color, CARD32 *pixel); -void +extern _X_EXPORT void miRenderPixelToColor (PictFormatPtr pPict, CARD32 pixel, xRenderColor *color); -Bool +extern _X_EXPORT Bool miIsSolidAlpha (PicturePtr pSrc); -void +extern _X_EXPORT void miCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects); -void +extern _X_EXPORT void miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box); -void +extern _X_EXPORT void miTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -155,13 +155,13 @@ miTrapezoids (CARD8 op, int ntrap, xTrapezoid *traps); -void +extern _X_EXPORT void miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds); -void +extern _X_EXPORT void miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds); -void +extern _X_EXPORT void miTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -171,7 +171,7 @@ miTriangles (CARD8 op, int ntri, xTriangle *tris); -void +extern _X_EXPORT void miTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -181,7 +181,7 @@ miTriStrip (CARD8 op, int npoint, xPointFixed *points); -void +extern _X_EXPORT void miTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -191,22 +191,22 @@ miTriFan (CARD8 op, int npoint, xPointFixed *points); -PicturePtr +extern _X_EXPORT PicturePtr miCreateAlphaPicture (ScreenPtr pScreen, PicturePtr pDst, PictFormatPtr pPictFormat, CARD16 width, CARD16 height); -Bool +extern _X_EXPORT Bool miInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat); -void +extern _X_EXPORT void miCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat); -void +extern _X_EXPORT void miUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, diff --git a/render/mirect.c b/render/mirect.c index 38f4faf67..b54fe6fe6 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -94,7 +94,7 @@ miColorRects (PicturePtr pDst, FreeScratchGC (pGC); } -_X_EXPORT void +void miCompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, diff --git a/render/mitrap.c b/render/mitrap.c index 05ec09e1b..8bdc8a8d0 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -34,7 +34,7 @@ #include "picturestr.h" #include "mipict.h" -_X_EXPORT PicturePtr +PicturePtr miCreateAlphaPicture (ScreenPtr pScreen, PicturePtr pDst, PictFormatPtr pPictFormat, @@ -94,7 +94,7 @@ miLineFixedX (xLineFixed *l, xFixed y, Bool ceil) return l->p1.x + (xFixed) (ex / dy); } -_X_EXPORT void +void miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box) { box->y1 = MAXSHORT; @@ -127,7 +127,7 @@ miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box) } } -_X_EXPORT void +void miTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/render/mitri.c b/render/mitri.c index f811c7769..a92c19b7e 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -33,7 +33,7 @@ #include "picturestr.h" #include "mipict.h" -_X_EXPORT void +void miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds) { bounds->x1 = xFixedToInt (points->x); @@ -61,13 +61,13 @@ miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds) } } -_X_EXPORT void +void miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds) { miPointFixedBounds (ntri * 3, (xPointFixed *) tris, bounds); } -_X_EXPORT void +void miTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -126,7 +126,7 @@ miTriangles (CARD8 op, } } -_X_EXPORT void +void miTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -157,7 +157,7 @@ miTriStrip (CARD8 op, xfree (tris); } -_X_EXPORT void +void miTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/render/picture.c b/render/picture.c index 0be9997a5..f99c53f86 100644 --- a/render/picture.c +++ b/render/picture.c @@ -44,16 +44,16 @@ #include "registry.h" static int PictureScreenPrivateKeyIndex; -_X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex; +DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex; static int PictureWindowPrivateKeyIndex; -_X_EXPORT DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKeyIndex; +DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKeyIndex; static int PictureGeneration; -_X_EXPORT RESTYPE PictureType; -_X_EXPORT RESTYPE PictFormatType; -_X_EXPORT RESTYPE GlyphSetType; -_X_EXPORT int PictureCmapPolicy = PictureCmapPolicyDefault; +RESTYPE PictureType; +RESTYPE PictFormatType; +RESTYPE GlyphSetType; +int PictureCmapPolicy = PictureCmapPolicyDefault; -_X_EXPORT Bool +Bool PictureDestroyWindow (WindowPtr pWindow) { ScreenPtr pScreen = pWindow->drawable.pScreen; @@ -75,7 +75,7 @@ PictureDestroyWindow (WindowPtr pWindow) return ret; } -_X_EXPORT Bool +Bool PictureCloseScreen (int index, ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -95,7 +95,7 @@ PictureCloseScreen (int index, ScreenPtr pScreen) return ret; } -_X_EXPORT void +void PictureStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef) { ScreenPtr pScreen = pColormap->pScreen; @@ -163,7 +163,7 @@ addFormat (FormatInitRec formats[256], #define Mask(n) ((n) == 32 ? 0xffffffff : ((1 << (n))-1)) -_X_EXPORT PictFormatPtr +PictFormatPtr PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp) { int nformats, f; @@ -401,7 +401,7 @@ PictureFindVisual (ScreenPtr pScreen, VisualID visual) return 0; } -_X_EXPORT Bool +Bool PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -441,7 +441,7 @@ PictureInitIndexedFormats (ScreenPtr pScreen) return TRUE; } -_X_EXPORT Bool +Bool PictureFinishInit (void) { int s; @@ -456,7 +456,7 @@ PictureFinishInit (void) return TRUE; } -_X_EXPORT Bool +Bool PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -468,7 +468,7 @@ PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel) } -_X_EXPORT int +int PictureGetSubpixelOrder (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -478,7 +478,7 @@ PictureGetSubpixelOrder (ScreenPtr pScreen) return ps->subpixel; } -_X_EXPORT PictFormatPtr +PictFormatPtr PictureMatchVisual (ScreenPtr pScreen, int depth, VisualPtr pVisual) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -531,7 +531,7 @@ PictureMatchVisual (ScreenPtr pScreen, int depth, VisualPtr pVisual) return 0; } -_X_EXPORT PictFormatPtr +PictFormatPtr PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 f) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -551,7 +551,7 @@ PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 f) return 0; } -_X_EXPORT int +int PictureParseCmapPolicy (const char *name) { if ( strcmp (name, "default" ) == 0) @@ -568,7 +568,7 @@ PictureParseCmapPolicy (const char *name) return PictureCmapPolicyInvalid; } -_X_EXPORT Bool +Bool PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { PictureScreenPtr ps; @@ -668,7 +668,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) return TRUE; } -_X_EXPORT void +void SetPictureToDefaults (PicturePtr pPicture) { pPicture->refcnt = 1; @@ -702,7 +702,7 @@ SetPictureToDefaults (PicturePtr pPicture) pPicture->pSourcePict = 0; } -_X_EXPORT PicturePtr +PicturePtr CreatePicture (Picture pid, DrawablePtr pDrawable, PictFormatPtr pFormat, @@ -797,7 +797,7 @@ static unsigned int INTERPOLATE_PIXEL_256(unsigned int x, unsigned int a, return x; } -_X_EXPORT CARD32 +CARD32 PictureGradientColor (PictGradientStopPtr stop1, PictGradientStopPtr stop2, CARD32 x) @@ -868,7 +868,7 @@ static PicturePtr createSourcePicture(void) return pPicture; } -_X_EXPORT PicturePtr +PicturePtr CreateSolidPicture (Picture pid, xRenderColor *color, int *error) { PicturePtr pPicture; @@ -890,7 +890,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error) return pPicture; } -_X_EXPORT PicturePtr +PicturePtr CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2, int nStops, xFixed *stops, xRenderColor *colors, int *error) { @@ -929,7 +929,7 @@ CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2, #define FixedToDouble(x) ((x)/65536.) -_X_EXPORT PicturePtr +PicturePtr CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer, xFixed innerRadius, xFixed outerRadius, int nStops, xFixed *stops, xRenderColor *colors, int *error) @@ -979,7 +979,7 @@ CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer return pPicture; } -_X_EXPORT PicturePtr +PicturePtr CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle, int nStops, xFixed *stops, xRenderColor *colors, int *error) { @@ -1020,7 +1020,7 @@ CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle, #define NEXT_PTR(_type) ((_type) ulist++->ptr) -_X_EXPORT int +int ChangePicture (PicturePtr pPicture, Mask vmask, XID *vlist, @@ -1249,7 +1249,7 @@ ChangePicture (PicturePtr pPicture, return error; } -_X_EXPORT int +int SetPictureClipRects (PicturePtr pPicture, int xOrigin, int yOrigin, @@ -1277,7 +1277,7 @@ SetPictureClipRects (PicturePtr pPicture, return result; } -_X_EXPORT int +int SetPictureClipRegion (PicturePtr pPicture, int xOrigin, int yOrigin, @@ -1335,7 +1335,7 @@ transformIsIdentity(PictTransform *t) (t->matrix[2][1] == 0)); } -_X_EXPORT int +int SetPictureTransform (PicturePtr pPicture, PictTransform *transform) { @@ -1374,7 +1374,7 @@ SetPictureTransform (PicturePtr pPicture, return Success; } -_X_EXPORT void +void CopyPicture (PicturePtr pSrc, Mask mask, PicturePtr pDst) @@ -1471,7 +1471,7 @@ ValidateOnePicture (PicturePtr pPicture) } } -_X_EXPORT void +void ValidatePicture(PicturePtr pPicture) { ValidateOnePicture (pPicture); @@ -1479,7 +1479,7 @@ ValidatePicture(PicturePtr pPicture) ValidateOnePicture (pPicture->alphaMap); } -_X_EXPORT int +int FreePicture (pointer value, XID pid) { @@ -1535,7 +1535,7 @@ FreePicture (pointer value, return Success; } -_X_EXPORT int +int FreePictFormat (pointer pPictFormat, XID pid) { @@ -1647,7 +1647,7 @@ ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, return op; } -_X_EXPORT void +void CompositePicture (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -1686,7 +1686,7 @@ CompositePicture (CARD8 op, height); } -_X_EXPORT void +void CompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, @@ -1699,7 +1699,7 @@ CompositeRects (CARD8 op, (*ps->CompositeRects) (op, pDst, color, nRect, rects); } -_X_EXPORT void +void CompositeTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1716,7 +1716,7 @@ CompositeTrapezoids (CARD8 op, (*ps->Trapezoids) (op, pSrc, pDst, maskFormat, xSrc, ySrc, ntrap, traps); } -_X_EXPORT void +void CompositeTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1733,7 +1733,7 @@ CompositeTriangles (CARD8 op, (*ps->Triangles) (op, pSrc, pDst, maskFormat, xSrc, ySrc, ntriangles, triangles); } -_X_EXPORT void +void CompositeTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1750,7 +1750,7 @@ CompositeTriStrip (CARD8 op, (*ps->TriStrip) (op, pSrc, pDst, maskFormat, xSrc, ySrc, npoints, points); } -_X_EXPORT void +void CompositeTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1767,7 +1767,7 @@ CompositeTriFan (CARD8 op, (*ps->TriFan) (op, pSrc, pDst, maskFormat, xSrc, ySrc, npoints, points); } -_X_EXPORT void +void AddTraps (PicturePtr pPicture, INT16 xOff, INT16 yOff, diff --git a/render/picture.h b/render/picture.h index 045b29944..8f67b846e 100644 --- a/render/picture.h +++ b/render/picture.h @@ -159,12 +159,12 @@ typedef enum _PictFormatShort { #define PictureCmapPolicyColor 3 #define PictureCmapPolicyAll 4 -extern int PictureCmapPolicy; +extern _X_EXPORT int PictureCmapPolicy; -int PictureParseCmapPolicy (const char *name); +extern _X_EXPORT int PictureParseCmapPolicy (const char *name); -extern int RenderErrBase; -extern DevPrivateKey RenderClientPrivateKey; +extern _X_EXPORT int RenderErrBase; +extern _X_EXPORT DevPrivateKey RenderClientPrivateKey; /* Fixed point updates from Carl Worth, USC, Information Sciences Institute */ diff --git a/render/picturestr.h b/render/picturestr.h index 500f800ce..194db11a3 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -396,11 +396,11 @@ typedef struct _PictureScreen { } PictureScreenRec, *PictureScreenPtr; -extern DevPrivateKey PictureScreenPrivateKey; -extern DevPrivateKey PictureWindowPrivateKey; -extern RESTYPE PictureType; -extern RESTYPE PictFormatType; -extern RESTYPE GlyphSetType; +extern _X_EXPORT DevPrivateKey PictureScreenPrivateKey; +extern _X_EXPORT DevPrivateKey PictureWindowPrivateKey; +extern _X_EXPORT RESTYPE PictureType; +extern _X_EXPORT RESTYPE PictFormatType; +extern _X_EXPORT RESTYPE GlyphSetType; #define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey)) #define GetPictureScreenIfSet(s) GetPictureScreen(s) @@ -424,76 +424,76 @@ extern RESTYPE GlyphSetType; } \ } \ -Bool +extern _X_EXPORT Bool PictureDestroyWindow (WindowPtr pWindow); -Bool +extern _X_EXPORT Bool PictureCloseScreen (int Index, ScreenPtr pScreen); -void +extern _X_EXPORT void PictureStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef); -Bool +extern _X_EXPORT Bool PictureInitIndexedFormat (ScreenPtr pScreen, PictFormatPtr format); -Bool +extern _X_EXPORT Bool PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel); -int +extern _X_EXPORT int PictureGetSubpixelOrder (ScreenPtr pScreen); -PictFormatPtr +extern _X_EXPORT PictFormatPtr PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp); -PictFormatPtr +extern _X_EXPORT PictFormatPtr PictureMatchVisual (ScreenPtr pScreen, int depth, VisualPtr pVisual); -PictFormatPtr +extern _X_EXPORT PictFormatPtr PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 format); -Bool +extern _X_EXPORT Bool PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); -int +extern _X_EXPORT int PictureGetFilterId (char *filter, int len, Bool makeit); -char * +extern _X_EXPORT char * PictureGetFilterName (int id); -int +extern _X_EXPORT int PictureAddFilter (ScreenPtr pScreen, char *filter, PictFilterValidateParamsProcPtr ValidateParams, int width, int height); -Bool +extern _X_EXPORT Bool PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias); -Bool +extern _X_EXPORT Bool PictureSetDefaultFilters (ScreenPtr pScreen); -void +extern _X_EXPORT void PictureResetFilters (ScreenPtr pScreen); -PictFilterPtr +extern _X_EXPORT PictFilterPtr PictureFindFilter (ScreenPtr pScreen, char *name, int len); -int +extern _X_EXPORT int SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter, xFixed *params, int nparams); -int +extern _X_EXPORT int SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int nparams); -Bool +extern _X_EXPORT Bool PictureFinishInit (void); -void +extern _X_EXPORT void SetPictureToDefaults (PicturePtr pPicture); -PicturePtr +extern _X_EXPORT PicturePtr CreatePicture (Picture pid, DrawablePtr pDrawable, PictFormatPtr pFormat, @@ -502,47 +502,47 @@ CreatePicture (Picture pid, ClientPtr client, int *error); -int +extern _X_EXPORT int ChangePicture (PicturePtr pPicture, Mask vmask, XID *vlist, DevUnion *ulist, ClientPtr client); -int +extern _X_EXPORT int SetPictureClipRects (PicturePtr pPicture, int xOrigin, int yOrigin, int nRect, xRectangle *rects); -int +extern _X_EXPORT int SetPictureClipRegion (PicturePtr pPicture, int xOrigin, int yOrigin, RegionPtr pRegion); -int +extern _X_EXPORT int SetPictureTransform (PicturePtr pPicture, PictTransform *transform); -void +extern _X_EXPORT void CopyPicture (PicturePtr pSrc, Mask mask, PicturePtr pDst); -void +extern _X_EXPORT void ValidatePicture(PicturePtr pPicture); -int +extern _X_EXPORT int FreePicture (pointer pPicture, XID pid); -int +extern _X_EXPORT int FreePictFormat (pointer pPictFormat, XID pid); -void +extern _X_EXPORT void CompositePicture (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -556,7 +556,7 @@ CompositePicture (CARD8 op, CARD16 width, CARD16 height); -void +extern _X_EXPORT void CompositeGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -567,14 +567,14 @@ CompositeGlyphs (CARD8 op, GlyphListPtr lists, GlyphPtr *glyphs); -void +extern _X_EXPORT void CompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects); -void +extern _X_EXPORT void CompositeTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -584,7 +584,7 @@ CompositeTrapezoids (CARD8 op, int ntrap, xTrapezoid *traps); -void +extern _X_EXPORT void CompositeTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -594,7 +594,7 @@ CompositeTriangles (CARD8 op, int ntriangles, xTriangle *triangles); -void +extern _X_EXPORT void CompositeTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -604,7 +604,7 @@ CompositeTriStrip (CARD8 op, int npoints, xPointFixed *points); -void +extern _X_EXPORT void CompositeTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -614,32 +614,32 @@ CompositeTriFan (CARD8 op, int npoints, xPointFixed *points); -CARD32 +extern _X_EXPORT CARD32 PictureGradientColor (PictGradientStopPtr stop1, PictGradientStopPtr stop2, CARD32 x); -void RenderExtensionInit (void); +extern _X_EXPORT void RenderExtensionInit (void); -Bool +extern _X_EXPORT Bool AnimCurInit (ScreenPtr pScreen); -int +extern _X_EXPORT int AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid); -void +extern _X_EXPORT void AddTraps (PicturePtr pPicture, INT16 xOff, INT16 yOff, int ntraps, xTrap *traps); -PicturePtr +extern _X_EXPORT PicturePtr CreateSolidPicture (Picture pid, xRenderColor *color, int *error); -PicturePtr +extern _X_EXPORT PicturePtr CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2, @@ -648,7 +648,7 @@ CreateLinearGradientPicture (Picture pid, xRenderColor *colors, int *error); -PicturePtr +extern _X_EXPORT PicturePtr CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer, @@ -659,7 +659,7 @@ CreateRadialGradientPicture (Picture pid, xRenderColor *colors, int *error); -PicturePtr +extern _X_EXPORT PicturePtr CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle, @@ -669,27 +669,27 @@ CreateConicalGradientPicture (Picture pid, int *error); #ifdef PANORAMIX -void PanoramiXRenderInit (void); -void PanoramiXRenderReset (void); +extern _X_EXPORT void PanoramiXRenderInit (void); +extern _X_EXPORT void PanoramiXRenderReset (void); #endif /* * matrix.c */ -void +extern _X_EXPORT void PictTransform_from_xRenderTransform (PictTransformPtr pict, xRenderTransform *render); -void +extern _X_EXPORT void xRenderTransform_from_PictTransform (xRenderTransform *render, PictTransformPtr pict); -Bool +extern _X_EXPORT Bool PictureTransformPoint (PictTransformPtr transform, PictVectorPtr vector); -Bool +extern _X_EXPORT Bool PictureTransformPoint3d (PictTransformPtr transform, PictVectorPtr vector); diff --git a/render/render.c b/render/render.c index 663ed24af..7cb93bd18 100644 --- a/render/render.c +++ b/render/render.c @@ -210,9 +210,9 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = { SProcRenderCreateConicalGradient }; -_X_EXPORT int RenderErrBase; +int RenderErrBase; static int RenderClientPrivateKeyIndex; -_X_EXPORT DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex; +DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex; typedef struct _RenderClient { int major_version; @@ -234,7 +234,7 @@ RenderClientCallback (CallbackListPtr *list, pRenderClient->minor_version = 0; } -_X_EXPORT void +void RenderExtensionInit (void) { ExtensionEntry *extEntry; @@ -3265,7 +3265,7 @@ PanoramiXRenderAddTraps (ClientPtr client) return result; } -_X_EXPORT void +void PanoramiXRenderInit (void) { int i; @@ -3295,7 +3295,7 @@ PanoramiXRenderInit (void) ProcRenderVector[X_RenderAddTraps] = PanoramiXRenderAddTraps; } -_X_EXPORT void +void PanoramiXRenderReset (void) { int i; diff --git a/render/renderedge.c b/render/renderedge.c index d0ee30716..8771fe164 100644 --- a/render/renderedge.c +++ b/render/renderedge.c @@ -31,7 +31,7 @@ * grid row */ -_X_EXPORT xFixed +xFixed RenderSampleCeilY (xFixed y, int n) { return pixman_sample_ceil_y (y, n); @@ -43,7 +43,7 @@ RenderSampleCeilY (xFixed y, int n) * Compute the largest value no greater than y which is on a * grid row */ -_X_EXPORT xFixed +xFixed RenderSampleFloorY (xFixed y, int n) { return pixman_sample_floor_y (y, n); @@ -52,7 +52,7 @@ RenderSampleFloorY (xFixed y, int n) /* * Step an edge by any amount (including negative values) */ -_X_EXPORT void +void RenderEdgeStep (RenderEdge *e, int n) { pixman_edge_step (e, n); @@ -62,7 +62,7 @@ RenderEdgeStep (RenderEdge *e, int n) * Initialize one edge structure given the line endpoints and a * starting y value */ -_X_EXPORT void +void RenderEdgeInit (RenderEdge *e, int n, xFixed y_start, @@ -78,7 +78,7 @@ RenderEdgeInit (RenderEdge *e, * Initialize one edge structure given a line, starting y value * and a pixel offset for the line */ -_X_EXPORT void +void RenderLineFixedEdgeInit (RenderEdge *e, int n, xFixed y, diff --git a/render/renderedge.h b/render/renderedge.h index 644d9d9e5..6585aeb90 100644 --- a/render/renderedge.h +++ b/render/renderedge.h @@ -76,16 +76,16 @@ typedef pixman_edge_t RenderEdge; } \ } -xFixed +extern _X_EXPORT xFixed RenderSampleCeilY (xFixed y, int bpp); -xFixed +extern _X_EXPORT xFixed RenderSampleFloorY (xFixed y, int bpp); -void +extern _X_EXPORT void RenderEdgeStep (RenderEdge *e, int n); -void +extern _X_EXPORT void RenderEdgeInit (RenderEdge *e, int bpp, xFixed y_start, @@ -94,7 +94,7 @@ RenderEdgeInit (RenderEdge *e, xFixed x_bot, xFixed y_bot); -void +extern _X_EXPORT void RenderLineFixedEdgeInit (RenderEdge *e, int bpp, xFixed y, -- cgit v1.2.3