diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-01-20 18:37:45 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-03-08 13:16:50 -0500 |
| commit | 1564c82417d201de5b9a5ec5e7aa4ef14c45fbad (patch) | |
| tree | 151801f1716c899db4ad57bb2b6ffc60592229c7 /hw/dmx/dmxpixmap.c | |
| parent | d8caa782009abf4dc17b945e325e83fda299a534 (diff) | |
dix: Remove usage_hint from pixmaps, store it in ->drawable.class
The class field was unused for pixmaps, and we don't have enough classes
to justify a whole uint32 anyway.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/dmx/dmxpixmap.c')
| -rw-r--r-- | hw/dmx/dmxpixmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index 81b71151a..a16736419 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -82,7 +82,7 @@ void dmxBECreatePixmap(PixmapPtr pPixmap) /** Create a pixmap for \a pScreen with the specified \a width, \a * height, and \a depth. */ PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, - unsigned usage_hint) + unsigned class) { DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum]; PixmapPtr pPixmap; @@ -104,7 +104,7 @@ PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, return NullPixmap; pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; + pPixmap->drawable.class = class; pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.depth = depth; pPixmap->drawable.bitsPerPixel = bpp; @@ -116,7 +116,6 @@ PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, pPixmap->drawable.height = height; pPixmap->devKind = PixmapBytePad(width, bpp); pPixmap->refcnt = 1; - pPixmap->usage_hint = usage_hint; pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap); pPixPriv->pixmap = (Pixmap)0; |