diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-10-26 15:13:50 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-10-26 15:14:03 -0700 |
| commit | 2251572062b2c25643671b8d5070de1c3f7ae976 (patch) | |
| tree | 3d77f33a83958cd47b2cdc37c69211d0081d341b /render | |
| parent | 497aba894904b08b15bb19916e2a163f96212a7d (diff) | |
Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.
Diffstat (limited to 'render')
| -rw-r--r-- | render/glyph.c | 47 | ||||
| -rw-r--r-- | render/mipict.c | 2 |
2 files changed, 24 insertions, 25 deletions
diff --git a/render/glyph.c b/render/glyph.c index 78b49b9c6..f3e3917b1 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -902,20 +902,22 @@ GlyphExtents (int nlist, #define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) -/* Stub ABI compatibility for mi*Glyph, should go away */ _X_EXPORT void -miGlyphs (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int nlist, - GlyphListPtr list, - GlyphPtr *glyphs) +CompositeGlyphs (CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, + INT16 ySrc, + int nlist, + GlyphListPtr lists, + GlyphPtr *glyphs) { - CompositeGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, - glyphs); + PictureScreenPtr ps = GetPictureScreen(pDst->pDrawable->pScreen); + + ValidatePicture (pSrc); + ValidatePicture (pDst); + (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, lists, glyphs); } Bool @@ -932,15 +934,15 @@ miUnrealizeGlyph (ScreenPtr pScreen, } _X_EXPORT void -CompositeGlyphs (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int nlist, - GlyphListPtr list, - GlyphPtr *glyphs) +miGlyphs (CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, + INT16 ySrc, + int nlist, + GlyphListPtr list, + GlyphPtr *glyphs) { PicturePtr pPicture; PixmapPtr pMaskPixmap = 0; @@ -955,9 +957,6 @@ CompositeGlyphs (CARD8 op, BoxRec extents = {0, 0, 0, 0}; CARD32 component_alpha; - ValidatePicture (pSrc); - ValidatePicture (pDst); - if (maskFormat) { GCPtr pGC; diff --git a/render/mipict.c b/render/mipict.c index 5aad676f5..87dccbbda 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -636,7 +636,7 @@ miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) /* MI rendering routines */ ps->Composite = 0; /* requires DDX support */ - ps->Glyphs = NULL; + ps->Glyphs = miGlyphs; ps->CompositeRects = miCompositeRects; ps->Trapezoids = miTrapezoids; ps->Triangles = miTriangles; |