diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-16 15:34:08 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:02:20 +0100 |
| commit | 54fde5bf05d43f26e7f1893584af736a138d245f (patch) | |
| tree | a17d3aad6e465733dfa505d24e52130864642186 /uxa | |
| parent | 43a34186d13d29c671431832469ca5301751b3cf (diff) | |
intel: convert sna/uxa to using new glyph picture accessors.
The compat-api.h takes care of old/new servers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'uxa')
| -rw-r--r-- | uxa/uxa-glyphs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c index 921b99c9..7db094b4 100644 --- a/uxa/uxa-glyphs.c +++ b/uxa/uxa-glyphs.c @@ -235,7 +235,7 @@ uxa_glyph_cache_upload_glyph(ScreenPtr screen, GlyphPtr glyph, int x, int y) { - PicturePtr pGlyphPicture = GlyphPicture(glyph)[screen->myNum]; + PicturePtr pGlyphPicture = GetGlyphPicture(glyph, screen); PixmapPtr pGlyphPixmap = (PixmapPtr) pGlyphPicture->pDrawable; PixmapPtr pCachePixmap = (PixmapPtr) cache->picture->pDrawable; PixmapPtr scratch; @@ -449,7 +449,6 @@ uxa_check_glyphs(CARD8 op, INT16 xSrc, INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs) { - int screen = dst->pDrawable->pScreen->myNum; pixman_image_t *image; PixmapPtr scratch; PicturePtr mask; @@ -513,7 +512,7 @@ uxa_check_glyphs(CARD8 op, n = list->len; while (n--) { GlyphPtr glyph = *glyphs++; - PicturePtr g = GlyphPicture(glyph)[screen]; + PicturePtr g = GetGlyphPicture(glyph, dst->pDrawable->pScreen); if (g) { if (maskFormat) { CompositePicture(PictOpAdd, g, NULL, mask, @@ -579,7 +578,7 @@ static PicturePtr uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) { uxa_screen_t *uxa_screen = uxa_get_screen(screen); - PicturePtr glyph_picture = GlyphPicture(glyph)[screen->myNum]; + PicturePtr glyph_picture = GetGlyphPicture(glyph, screen); uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[PICT_FORMAT_RGB(glyph_picture->format) != 0]; struct uxa_glyph *priv = NULL; int size, mask, pos, s; @@ -796,7 +795,7 @@ uxa_glyphs_via_mask(CARD8 op, this_atlas = uxa_glyph_cache(screen, glyph, &src_x, &src_y); if (this_atlas == NULL) { /* no cache for this glyph */ - this_atlas = GlyphPicture(glyph)[screen->myNum]; + this_atlas = GetGlyphPicture(glyph, screen); src_x = src_y = 0; } } |