diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-05 09:47:24 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-21 12:59:20 +0100 |
| commit | cc4fe613d0b0891ea9502340801b37e64301f573 (patch) | |
| tree | be87cb78ca43fd065da861dbc4803211d2d1ac5b /exa | |
| parent | a45e1d6cc6f2a5f31ed737294351cfa251caa030 (diff) | |
render/exa: use glyph picture accessors
use the glyph picture accessors in the X server, render and EXA code.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'exa')
| -rw-r--r-- | exa/exa_glyphs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index 2538bce01..71f750fb6 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -365,7 +365,7 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen, ExaGlyphCachePtr cache, int x, int y, GlyphPtr pGlyph) { ExaScreenPriv(pScreen); - PicturePtr pGlyphPicture = GlyphPicture(pGlyph)[pScreen->myNum]; + PicturePtr pGlyphPicture = GetGlyphPicture(pGlyph, pScreen); PixmapPtr pGlyphPixmap = (PixmapPtr) pGlyphPicture->pDrawable; ExaPixmapPriv(pGlyphPixmap); @@ -544,7 +544,7 @@ exaBufferGlyph(ScreenPtr pScreen, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst) { ExaScreenPriv(pScreen); - unsigned int format = (GlyphPicture(pGlyph)[pScreen->myNum])->format; + unsigned int format = (GetGlyphPicture(pGlyph, pScreen))->format; int width = pGlyph->info.width; int height = pGlyph->info.height; ExaCompositeRectPtr rect; @@ -586,7 +586,7 @@ exaBufferGlyph(ScreenPtr pScreen, /* Couldn't find the glyph in the cache, use the glyph picture directly */ - mask = GlyphPicture(pGlyph)[pScreen->myNum]; + mask = GetGlyphPicture(pGlyph, pScreen); if (buffer->mask && buffer->mask != mask) return ExaGlyphNeedFlush; |