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/xnest | |
| 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/xnest')
| -rw-r--r-- | hw/xnest/Pixmap.c | 5 | ||||
| -rw-r--r-- | hw/xnest/XNPixmap.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 3a92ffde8..c901db19f 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -37,7 +37,7 @@ DevPrivateKeyRec xnestPixmapPrivateKeyRec; PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, - unsigned usage_hint) + unsigned class) { PixmapPtr pPixmap; @@ -45,7 +45,7 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, if (!pPixmap) return NullPixmap; pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; + pPixmap->drawable.class = class; pPixmap->drawable.depth = depth; pPixmap->drawable.bitsPerPixel = depth; pPixmap->drawable.id = 0; @@ -57,7 +57,6 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->refcnt = 1; pPixmap->devKind = PixmapBytePad(width, depth); - pPixmap->usage_hint = usage_hint; if (width && height) xnestPixmapPriv(pPixmap)->pixmap = XCreatePixmap(xnestDisplay, diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index aa671ed1f..638a43a1a 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -30,7 +30,7 @@ typedef struct { #define xnestSharePixmap(pPixmap) ((pPixmap)->refcnt++) PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height, - int depth, unsigned usage_hint); + int depth, unsigned class); Bool xnestDestroyPixmap(PixmapPtr pPixmap); RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap); |