diff --git a/composite/compwindow.c b/composite/compwindow.c index 722139c2a8..9a2d6fc6a6 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -49,6 +49,7 @@ #include "dix/window_priv.h" #include "include/extinit.h" #include "os/osdep.h" +#include "render/picturestr_priv.h" #include "Xext/panoramiXsrv.h" #include "compint.h" diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 92e316e842..6d6bc847a3 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -61,6 +61,7 @@ #include "os/log_priv.h" #include "os/osdep.h" #include "randr/randrstr_priv.h" +#include "render/picturestr_priv.h" #include "servermd.h" #include "windowstr.h" @@ -83,7 +84,6 @@ #include "xf86Xinput.h" #include "xf86InPriv.h" #include "xf86Crtc.h" -#include "picturestr.h" #include "xf86Bus.h" #include "globals.h" #include "xserver-properties.h" diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c index 262da9fced..68b854871a 100644 --- a/hw/xwin/winrandr.c +++ b/hw/xwin/winrandr.c @@ -36,6 +36,7 @@ #include "win.h" #include "randr/randrstr_priv.h" +#include "render/picturestr_priv.h" /* * Answer queries about the RandR features supported. diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 3a3ae6970b..9b69b566ca 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -29,6 +29,7 @@ #include "dix/rpcbuf_priv.h" #include "randr/randrstr_priv.h" #include "randr/rrdispatch_priv.h" +#include "render/picturestr_priv.h" #include "os/bug_priv.h" #include "os/osdep.h" diff --git a/randr/rrinfo.c b/randr/rrinfo.c index 2b52e5afa8..1204ca7d9c 100644 --- a/randr/rrinfo.c +++ b/randr/rrinfo.c @@ -22,6 +22,7 @@ #include #include "randr/randrstr_priv.h" +#include "render/picturestr_priv.h" #ifdef RANDR_10_INTERFACE static RRModePtr diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 168e4c6bf8..3b4a5205ec 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -26,6 +26,7 @@ #include "dix/server_priv.h" #include "randr/randrstr_priv.h" #include "randr/rrdispatch_priv.h" +#include "render/picturestr_priv.h" static CARD16 RR10CurrentSizeID(ScreenPtr pScreen); diff --git a/render/filter.c b/render/filter.c index 5413982efb..c83cb643d1 100644 --- a/render/filter.c +++ b/render/filter.c @@ -26,6 +26,7 @@ #include #include "dix/screenint_priv.h" +#include "render/picturestr_priv.h" #include "misc.h" #include "scrnintstr.h" diff --git a/render/glyph.c b/render/glyph.c index f624be97bf..194d304ab0 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -27,6 +27,7 @@ #include "dix/screenint_priv.h" #include "os/bug_priv.h" #include "os/xsha1.h" +#include "render/picturestr_priv.h" #include "misc.h" #include "scrnintstr.h" diff --git a/render/matrix.c b/render/matrix.c index 8f07d35803..e06e1c14ee 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -22,6 +22,8 @@ #include +#include "render/picturestr_priv.h" + #include "misc.h" #include "scrnintstr.h" #include "os.h" diff --git a/render/mipict.c b/render/mipict.c index 02faaca066..1b94412b8c 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -24,13 +24,13 @@ #include #include "os/osdep.h" +#include "render/picturestr_priv.h" #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" #include "windowstr.h" #include "mi.h" -#include "picturestr.h" #include "mipict.h" int diff --git a/render/picturestr.h b/render/picturestr.h index 7029647529..ef4aa19364 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -356,52 +356,15 @@ extern _X_EXPORT PictFormatPtr extern _X_EXPORT Bool PictureSetSubpixelOrder(ScreenPtr pScreen, int subpixel); -extern _X_EXPORT int - PictureGetSubpixelOrder(ScreenPtr pScreen); - -extern _X_EXPORT PictFormatPtr -PictureMatchVisual(ScreenPtr pScreen, int depth, VisualPtr pVisual); - extern _X_EXPORT PictFormatPtr PictureMatchFormat(ScreenPtr pScreen, int depth, CARD32 format); -extern _X_EXPORT Bool - PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); - -extern _X_EXPORT int - PictureGetFilterId(const char *filter, int len, Bool makeit); - extern _X_EXPORT char *PictureGetFilterName(int id); -extern _X_EXPORT int -PictureAddFilter(ScreenPtr pScreen, - const char *filter, - PictFilterValidateParamsProcPtr ValidateParams, - int width, int height); - -extern _X_EXPORT Bool -PictureSetFilterAlias(ScreenPtr pScreen, const char *filter, const char *alias); - -extern _X_EXPORT Bool - PictureSetDefaultFilters(ScreenPtr pScreen); - -extern _X_EXPORT void - PictureResetFilters(ScreenPtr pScreen); - -extern _X_EXPORT PictFilterPtr -PictureFindFilter(ScreenPtr pScreen, char *name, int len); - extern _X_EXPORT int SetPicturePictFilter(PicturePtr pPicture, PictFilterPtr pFilter, xFixed * params, int nparams); -extern _X_EXPORT int -SetPictureFilter(PicturePtr pPicture, char *name, int len, - xFixed * params, int nparams); - -extern _X_EXPORT Bool - PictureFinishInit(void); - extern _X_EXPORT PicturePtr CreatePicture(Picture pid, DrawablePtr pDrawable, @@ -412,15 +375,6 @@ extern _X_EXPORT int ChangePicture(PicturePtr pPicture, Mask vmask, XID *vlist, DevUnion *ulist, ClientPtr client); -extern _X_EXPORT int - -SetPictureClipRects(PicturePtr pPicture, - int xOrigin, int yOrigin, int nRect, xRectangle *rects); - -extern _X_EXPORT int -SetPictureClipRegion(PicturePtr pPicture, - int xOrigin, int yOrigin, RegionPtr pRegion); - extern _X_EXPORT int SetPictureTransform(PicturePtr pPicture, PictTransform * transform); @@ -441,94 +395,14 @@ CompositePicture(CARD8 op, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); -extern _X_EXPORT void -CompositeGlyphs(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, int nlist, GlyphListPtr lists, GlyphPtr * glyphs); - -extern _X_EXPORT void -CompositeRects(CARD8 op, - PicturePtr pDst, - xRenderColor * color, int nRect, xRectangle *rects); - -extern _X_EXPORT void -CompositeTrapezoids(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps); - -extern _X_EXPORT void -CompositeTriangles(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, int ntriangles, xTriangle * triangles); - -extern _X_EXPORT void -CompositeTriStrip(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points); - -extern _X_EXPORT void -CompositeTriFan(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points); - -extern _X_EXPORT void -AddTraps(PicturePtr pPicture, - INT16 xOff, INT16 yOff, int ntraps, xTrap * traps); - extern _X_EXPORT PicturePtr CreateSolidPicture(Picture pid, xRenderColor * color, int *error); -extern _X_EXPORT PicturePtr -CreateLinearGradientPicture(Picture pid, - xPointFixed * p1, - xPointFixed * p2, - int nStops, - xFixed * stops, xRenderColor * colors, int *error); - -extern _X_EXPORT PicturePtr -CreateRadialGradientPicture(Picture pid, - xPointFixed * inner, - xPointFixed * outer, - xFixed innerRadius, - xFixed outerRadius, - int nStops, - xFixed * stops, xRenderColor * colors, int *error); - -extern _X_EXPORT PicturePtr -CreateConicalGradientPicture(Picture pid, - xPointFixed * center, - xFixed angle, - int nStops, - xFixed * stops, xRenderColor * colors, int *error); - /* * matrix.c */ -extern _X_EXPORT void -PictTransform_from_xRenderTransform(PictTransformPtr pict, - xRenderTransform * render); - -extern _X_EXPORT void -xRenderTransform_from_PictTransform(xRenderTransform * render, - PictTransformPtr pict); - extern _X_EXPORT Bool PictureTransformPoint(PictTransformPtr transform, PictVectorPtr vector); -extern _X_EXPORT Bool - PictureTransformPoint3d(PictTransformPtr transform, PictVectorPtr vector); - #endif /* _PICTURESTR_H_ */ diff --git a/render/picturestr_priv.h b/render/picturestr_priv.h index 525471df4d..d903671ebb 100644 --- a/render/picturestr_priv.h +++ b/render/picturestr_priv.h @@ -43,4 +43,66 @@ void PanoramiXRenderInit(void); void PanoramiXRenderReset(void); #endif /* XINERAMA */ +int PictureGetSubpixelOrder(ScreenPtr pScreen); +Bool PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); +int PictureGetFilterId(const char *filter, int len, Bool makeit); +int PictureAddFilter(ScreenPtr pScreen, const char *filter, + PictFilterValidateParamsProcPtr ValidateParams, + int width, int height); +Bool PictureSetFilterAlias(ScreenPtr pScreen, const char *filter, + const char *alias); +Bool PictureSetDefaultFilters(ScreenPtr pScreen); +void PictureResetFilters(ScreenPtr pScreen); +Bool PictureFinishInit(void); +int SetPictureClipRects(PicturePtr pPicture, int xOrigin, int yOrigin, + int nRect, xRectangle *rects); +int SetPictureClipRegion(PicturePtr pPicture, int xOrigin, int yOrigin, + RegionPtr pRegion); +void CompositeGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int nlist, GlyphListPtr lists, GlyphPtr *glyphs); +void CompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, + int nRect, xRectangle *rects); +void CompositeTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int ntrap, xTrapezoid *traps); +void CompositeTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int ntriangles, xTriangle * triangles); +void CompositeTriStrip(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int npoints, xPointFixed * points); +void CompositeTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int npoints, xPointFixed * points); +void AddTraps(PicturePtr pPicture, INT16 xOff, INT16 yOff, int ntraps, + xTrap *traps); +PicturePtr CreateLinearGradientPicture(Picture pid, xPointFixed *p1, + xPointFixed *p2, int nStops, + xFixed *stops, xRenderColor *colors, + int *error); +PicturePtr CreateRadialGradientPicture(Picture pid, xPointFixed *inner, + xPointFixed *outer, xFixed innerRadius, + xFixed outerRadius, int nStops, + xFixed *stops, xRenderColor *colors, + int *error); +PicturePtr CreateConicalGradientPicture(Picture pid, xPointFixed *center, + xFixed angle, int nStops, xFixed *stops, + xRenderColor *colors, int *error); +void PictTransform_from_xRenderTransform(PictTransformPtr pict, + xRenderTransform *render); +void xRenderTransform_from_PictTransform(xRenderTransform *render, + PictTransformPtr pict); +Bool PictureTransformPoint3d(PictTransformPtr transform, + PictVectorPtr vector); + +/* these need to be _X_EXPORT'ed for Nvidia proprietary, but should not + be used by external drivers anymore */ +_X_EXPORT PictFormatPtr PictureMatchVisual(ScreenPtr pScreen, int depth, + VisualPtr pVisual); +_X_EXPORT PictFilterPtr PictureFindFilter(ScreenPtr pScreen, char *name, + int len); +_X_EXPORT int SetPictureFilter(PicturePtr pPicture, char *name, int len, + xFixed *params, int nparams); + #endif /* _XSERVER_PICTURESTR_PRIV_H_ */