← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xserver-xorg-video-intel/utopic

« back to all changes in this revision

Viewing changes to src/sna/sna_glyphs.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-12 07:43:59 UTC
  • mfrom: (1.4.22)
  • Revision ID: package-import@ubuntu.com-20120912074359-i3h8ol6hoghbemoq
Tags: 2:2.20.7-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/sna_glyphs.c
104
104
#define assert_pixmap_contains_box(p, b)
105
105
#endif
106
106
 
 
107
extern DevPrivateKeyRec sna_glyph_key;
 
108
 
107
109
static inline struct sna_glyph *sna_glyph(GlyphPtr glyph)
108
110
{
109
 
        return (struct sna_glyph *)glyph->devPrivates;
 
111
        return dixGetPrivateAddr(&glyph->devPrivates, &sna_glyph_key);
110
112
}
111
113
 
112
114
#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
217
219
                priv = sna_pixmap(pixmap);
218
220
                if (priv != NULL) {
219
221
                        /* Prevent the cache from ever being paged out */
220
 
                        priv->pinned = true;
 
222
                        priv->pinned = PIN_SCANOUT;
221
223
 
222
224
                        component_alpha = NeedsComponent(pPictFormat->format);
223
225
                        picture = CreatePicture(0, &pixmap->drawable, pPictFormat,