diff options
Diffstat (limited to 'render')
-rw-r--r-- | render/animcur.c | 4 | ||||
-rw-r--r-- | render/filter.c | 14 | ||||
-rw-r--r-- | render/glyph.c | 34 | ||||
-rw-r--r-- | render/miindex.c | 6 | ||||
-rw-r--r-- | render/mipict.c | 24 | ||||
-rw-r--r-- | render/mitrap.c | 6 | ||||
-rw-r--r-- | render/mitri.c | 10 | ||||
-rw-r--r-- | render/picture.c | 72 | ||||
-rw-r--r-- | render/render.c | 10 |
9 files changed, 90 insertions, 90 deletions
diff --git a/render/animcur.c b/render/animcur.c index d80094d98..c15149220 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -345,7 +345,7 @@ AnimCurRecolorCursor (DeviceIntPtr pDev, Wrap (as, pScreen, RecolorCursor, AnimCurRecolorCursor); } -Bool +_X_EXPORT Bool AnimCurInit (ScreenPtr pScreen) { AnimCurScreenPtr as; @@ -378,7 +378,7 @@ AnimCurInit (ScreenPtr pScreen) return TRUE; } -int +_X_EXPORT 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 21eedca31..fa9f986da 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 */ -int +_X_EXPORT int PictureGetFilterId (char *filter, int len, Bool makeit) { int i; @@ -102,7 +102,7 @@ PictureSetDefaultIds (void) return TRUE; } -char * +_X_EXPORT char * PictureGetFilterName (int id) { if (0 <= id && id < nfilterNames) @@ -193,7 +193,7 @@ PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias) return TRUE; } -PictFilterPtr +_X_EXPORT PictFilterPtr PictureFindFilter (ScreenPtr pScreen, char *name, int len) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -244,7 +244,7 @@ convolutionFilterValidateParams (ScreenPtr pScreen, } -Bool +_X_EXPORT Bool PictureSetDefaultFilters (ScreenPtr pScreen) { if (!filterNames) @@ -268,7 +268,7 @@ PictureSetDefaultFilters (ScreenPtr pScreen) return TRUE; } -void +_X_EXPORT void PictureResetFilters (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -278,7 +278,7 @@ PictureResetFilters (ScreenPtr pScreen) PictureFreeFilterIds (); } -int +_X_EXPORT 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); } -int +_X_EXPORT int SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter, xFixed *params, int nparams) { diff --git a/render/glyph.c b/render/glyph.c index 87b332e2a..36d073f80 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -96,7 +96,7 @@ FreeGlyphPrivates (GlyphPtr glyph) glyph->devPrivates = NULL; } -void +_X_EXPORT void GlyphUninit (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen (pScreen); @@ -129,7 +129,7 @@ GlyphUninit (ScreenPtr pScreen) } } -GlyphHashSetPtr +_X_EXPORT GlyphHashSetPtr FindGlyphHashSet (CARD32 filled) { int i; @@ -140,7 +140,7 @@ FindGlyphHashSet (CARD32 filled) return 0; } -GlyphRefPtr +_X_EXPORT GlyphRefPtr FindGlyphRef (GlyphHashPtr hash, CARD32 signature, Bool match, @@ -192,7 +192,7 @@ FindGlyphRef (GlyphHashPtr hash, return gr; } -int +_X_EXPORT int HashGlyph (xGlyphInfo *gi, CARD8 *bits, unsigned long size, @@ -229,7 +229,7 @@ HashGlyph (xGlyphInfo *gi, return Success; } -GlyphPtr +_X_EXPORT GlyphPtr FindGlyphByHash (unsigned char sha1[20], int format) { GlyphRefPtr gr; @@ -272,7 +272,7 @@ CheckDuplicates (GlyphHashPtr hash, char *where) #define DuplicateRef(a,b) #endif -void +_X_EXPORT void FreeGlyph (GlyphPtr glyph, int format) { CheckDuplicates (&globalGlyphs[format], "FreeGlyph"); @@ -321,7 +321,7 @@ FreeGlyph (GlyphPtr glyph, int format) } } -void +_X_EXPORT 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"); } -Bool +_X_EXPORT Bool DeleteGlyph (GlyphSetPtr glyphSet, Glyph id) { GlyphRefPtr gr; @@ -384,7 +384,7 @@ DeleteGlyph (GlyphSetPtr glyphSet, Glyph id) return FALSE; } -GlyphPtr +_X_EXPORT GlyphPtr FindGlyph (GlyphSetPtr glyphSet, Glyph id) { GlyphPtr glyph; @@ -395,7 +395,7 @@ FindGlyph (GlyphSetPtr glyphSet, Glyph id) return glyph; } -GlyphPtr +_X_EXPORT GlyphPtr AllocateGlyph (xGlyphInfo *gi, int fdepth) { PictureScreenPtr ps; @@ -438,7 +438,7 @@ bail: return 0; } -Bool +_X_EXPORT Bool AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet) { hash->table = xcalloc (hashSet->size, sizeof (GlyphRefRec)); @@ -449,7 +449,7 @@ AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet) return TRUE; } -Bool +_X_EXPORT Bool ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) { CARD32 tableEntries; @@ -492,14 +492,14 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) return TRUE; } -Bool +_X_EXPORT Bool ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change) { return (ResizeGlyphHash (&glyphSet->hash, change, FALSE) && ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], change, TRUE)); } -GlyphSetPtr +_X_EXPORT GlyphSetPtr AllocateGlyphSet (int fdepth, PictFormatPtr format) { GlyphSetPtr glyphSet; @@ -527,7 +527,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format) return glyphSet; } -int +_X_EXPORT int FreeGlyphSet (pointer value, XID gid) { @@ -632,14 +632,14 @@ CompositeGlyphs (CARD8 op, (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, lists, glyphs); } -Bool +_X_EXPORT Bool miRealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph) { return TRUE; } -void +_X_EXPORT void miUnrealizeGlyph (ScreenPtr pScreen, GlyphPtr glyph) { diff --git a/render/miindex.c b/render/miindex.c index 4e0cf0084..41052693d 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -232,7 +232,7 @@ FindBestGray (miIndexedPtr pIndexed, Pixel *pixels, int num, int gray) return best; } -Bool +_X_EXPORT Bool miInitIndexed (ScreenPtr pScreen, PictFormatPtr pFormat) { @@ -318,7 +318,7 @@ miInitIndexed (ScreenPtr pScreen, return TRUE; } -void +_X_EXPORT void miCloseIndexed (ScreenPtr pScreen, PictFormatPtr pFormat) { @@ -334,7 +334,7 @@ miCloseIndexed (ScreenPtr pScreen, } } -void +_X_EXPORT void miUpdateIndexed (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, diff --git a/render/mipict.c b/render/mipict.c index 2fadd8c36..abb6239ce 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -37,20 +37,20 @@ #define __inline #endif -int +_X_EXPORT int miCreatePicture (PicturePtr pPicture) { return Success; } -void +_X_EXPORT void miDestroyPicture (PicturePtr pPicture) { if (pPicture->freeCompClip) REGION_DESTROY(pPicture->pDrawable->pScreen, pPicture->pCompositeClip); } -void +_X_EXPORT void miDestroyPictureClip (PicturePtr pPicture) { switch (pPicture->clientClipType) { @@ -71,7 +71,7 @@ miDestroyPictureClip (PicturePtr pPicture) pPicture->clientClipType = CT_NONE; } -int +_X_EXPORT int miChangePictureClip (PicturePtr pPicture, int type, pointer value, @@ -116,14 +116,14 @@ miChangePictureClip (PicturePtr pPicture, return Success; } -void +_X_EXPORT void miChangePicture (PicturePtr pPicture, Mask mask) { return; } -void +_X_EXPORT void miValidatePicture (PicturePtr pPicture, Mask mask) { @@ -248,14 +248,14 @@ miValidatePicture (PicturePtr pPicture, } } -int +_X_EXPORT int miChangePictureTransform (PicturePtr pPicture, PictTransform *transform) { return Success; } -int +_X_EXPORT int miChangePictureFilter (PicturePtr pPicture, int filter, xFixed *params, @@ -341,7 +341,7 @@ miClipPictureSrc (RegionPtr pRegion, } } -void +_X_EXPORT void miCompositeSourceValidate (PicturePtr pPicture, INT16 x, INT16 y, @@ -494,7 +494,7 @@ miComputeCompositeRegion (RegionPtr pRegion, return TRUE; } -void +_X_EXPORT void miRenderColorToPixel (PictFormatPtr format, xRenderColor *color, CARD32 *pixel) @@ -545,7 +545,7 @@ miFillColor (CARD32 pixel, int bits) return (CARD16) pixel; } -Bool +_X_EXPORT Bool miIsSolidAlpha (PicturePtr pSrc) { ScreenPtr pScreen; @@ -579,7 +579,7 @@ miIsSolidAlpha (PicturePtr pSrc) } } -void +_X_EXPORT void miRenderPixelToColor (PictFormatPtr format, CARD32 pixel, xRenderColor *color) diff --git a/render/mitrap.c b/render/mitrap.c index 8bdc8a8d0..05ec09e1b 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -34,7 +34,7 @@ #include "picturestr.h" #include "mipict.h" -PicturePtr +_X_EXPORT 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); } -void +_X_EXPORT void miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box) { box->y1 = MAXSHORT; @@ -127,7 +127,7 @@ miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box) } } -void +_X_EXPORT void miTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/render/mitri.c b/render/mitri.c index a92c19b7e..f811c7769 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -33,7 +33,7 @@ #include "picturestr.h" #include "mipict.h" -void +_X_EXPORT void miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds) { bounds->x1 = xFixedToInt (points->x); @@ -61,13 +61,13 @@ miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds) } } -void +_X_EXPORT void miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds) { miPointFixedBounds (ntri * 3, (xPointFixed *) tris, bounds); } -void +_X_EXPORT void miTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -126,7 +126,7 @@ miTriangles (CARD8 op, } } -void +_X_EXPORT void miTriStrip (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -157,7 +157,7 @@ miTriStrip (CARD8 op, xfree (tris); } -void +_X_EXPORT void miTriFan (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/render/picture.c b/render/picture.c index d672ebc8c..0be9997a5 100644 --- a/render/picture.c +++ b/render/picture.c @@ -46,14 +46,14 @@ static int PictureScreenPrivateKeyIndex; _X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex; static int PictureWindowPrivateKeyIndex; -DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKeyIndex; +_X_EXPORT DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKeyIndex; static int PictureGeneration; -RESTYPE PictureType; -RESTYPE PictFormatType; -RESTYPE GlyphSetType; -int PictureCmapPolicy = PictureCmapPolicyDefault; +_X_EXPORT RESTYPE PictureType; +_X_EXPORT RESTYPE PictFormatType; +_X_EXPORT RESTYPE GlyphSetType; +_X_EXPORT int PictureCmapPolicy = PictureCmapPolicyDefault; -Bool +_X_EXPORT Bool PictureDestroyWindow (WindowPtr pWindow) { ScreenPtr pScreen = pWindow->drawable.pScreen; @@ -75,7 +75,7 @@ PictureDestroyWindow (WindowPtr pWindow) return ret; } -Bool +_X_EXPORT Bool PictureCloseScreen (int index, ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); @@ -95,7 +95,7 @@ PictureCloseScreen (int index, ScreenPtr pScreen) return ret; } -void +_X_EXPORT 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)) -PictFormatPtr +_X_EXPORT PictFormatPtr PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp) { int nformats, f; @@ -401,7 +401,7 @@ PictureFindVisual (ScreenPtr pScreen, VisualID visual) return 0; } -Bool +_X_EXPORT Bool PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format) { PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); @@ -441,7 +441,7 @@ PictureInitIndexedFormats (ScreenPtr pScreen) return TRUE; } -Bool +_X_EXPORT Bool PictureFinishInit (void) { int s; @@ -478,7 +478,7 @@ PictureGetSubpixelOrder (ScreenPtr pScreen) return ps->subpixel; } -PictFormatPtr +_X_EXPORT 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; } -PictFormatPtr +_X_EXPORT 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; } -int +_X_EXPORT int PictureParseCmapPolicy (const char *name) { if ( strcmp (name, "default" ) == 0) @@ -668,7 +668,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) return TRUE; } -void +_X_EXPORT void SetPictureToDefaults (PicturePtr pPicture) { pPicture->refcnt = 1; @@ -702,7 +702,7 @@ SetPictureToDefaults (PicturePtr pPicture) pPicture->pSourcePict = 0; } -PicturePtr +_X_EXPORT 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; } -CARD32 +_X_EXPORT CARD32 PictureGradientColor (PictGradientStopPtr stop1, PictGradientStopPtr stop2, CARD32 x) @@ -868,7 +868,7 @@ static PicturePtr createSourcePicture(void) return pPicture; } -PicturePtr +_X_EXPORT PicturePtr CreateSolidPicture (Picture pid, xRenderColor *color, int *error) { PicturePtr pPicture; @@ -890,7 +890,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error) return pPicture; } -PicturePtr +_X_EXPORT 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.) -PicturePtr +_X_EXPORT 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; } -PicturePtr +_X_EXPORT 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) -int +_X_EXPORT int ChangePicture (PicturePtr pPicture, Mask vmask, XID *vlist, @@ -1249,7 +1249,7 @@ ChangePicture (PicturePtr pPicture, return error; } -int +_X_EXPORT int SetPictureClipRects (PicturePtr pPicture, int xOrigin, int yOrigin, @@ -1277,7 +1277,7 @@ SetPictureClipRects (PicturePtr pPicture, return result; } -int +_X_EXPORT int SetPictureClipRegion (PicturePtr pPicture, int xOrigin, int yOrigin, @@ -1335,7 +1335,7 @@ transformIsIdentity(PictTransform *t) (t->matrix[2][1] == 0)); } -int +_X_EXPORT int SetPictureTransform (PicturePtr pPicture, PictTransform *transform) { @@ -1374,7 +1374,7 @@ SetPictureTransform (PicturePtr pPicture, return Success; } -void +_X_EXPORT void CopyPicture (PicturePtr pSrc, Mask mask, PicturePtr pDst) @@ -1471,7 +1471,7 @@ ValidateOnePicture (PicturePtr pPicture) } } -void +_X_EXPORT void ValidatePicture(PicturePtr pPicture) { ValidateOnePicture (pPicture); @@ -1479,7 +1479,7 @@ ValidatePicture(PicturePtr pPicture) ValidateOnePicture (pPicture->alphaMap); } -int +_X_EXPORT int FreePicture (pointer value, XID pid) { @@ -1535,7 +1535,7 @@ FreePicture (pointer value, return Success; } -int +_X_EXPORT int FreePictFormat (pointer pPictFormat, XID pid) { @@ -1647,7 +1647,7 @@ ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, return op; } -void +_X_EXPORT void CompositePicture (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -1686,7 +1686,7 @@ CompositePicture (CARD8 op, height); } -void +_X_EXPORT void CompositeRects (CARD8 op, PicturePtr pDst, xRenderColor *color, @@ -1699,7 +1699,7 @@ CompositeRects (CARD8 op, (*ps->CompositeRects) (op, pDst, color, nRect, rects); } -void +_X_EXPORT 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); } -void +_X_EXPORT 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); } -void +_X_EXPORT 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); } -void +_X_EXPORT 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); } -void +_X_EXPORT void AddTraps (PicturePtr pPicture, INT16 xOff, INT16 yOff, diff --git a/render/render.c b/render/render.c index 7cb93bd18..663ed24af 100644 --- a/render/render.c +++ b/render/render.c @@ -210,9 +210,9 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = { SProcRenderCreateConicalGradient }; -int RenderErrBase; +_X_EXPORT int RenderErrBase; static int RenderClientPrivateKeyIndex; -DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex; +_X_EXPORT DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex; typedef struct _RenderClient { int major_version; @@ -234,7 +234,7 @@ RenderClientCallback (CallbackListPtr *list, pRenderClient->minor_version = 0; } -void +_X_EXPORT void RenderExtensionInit (void) { ExtensionEntry *extEntry; @@ -3265,7 +3265,7 @@ PanoramiXRenderAddTraps (ClientPtr client) return result; } -void +_X_EXPORT void PanoramiXRenderInit (void) { int i; @@ -3295,7 +3295,7 @@ PanoramiXRenderInit (void) ProcRenderVector[X_RenderAddTraps] = PanoramiXRenderAddTraps; } -void +_X_EXPORT void PanoramiXRenderReset (void) { int i; |