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/xwin | |
| 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/xwin')
| -rw-r--r-- | hw/xwin/win.h | 2 | ||||
| -rw-r--r-- | hw/xwin/winpixmap.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 3f40fdbe0..606645f9f 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -1069,7 +1069,7 @@ winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen); PixmapPtr winCreatePixmapNativeGDI (ScreenPtr pScreen, int width, int height, int depth, - unsigned usage_hint); + unsigned class); Bool winDestroyPixmapNativeGDI (PixmapPtr pPixmap); diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 8bd8e3478..62717f31b 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -57,7 +57,7 @@ winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix, PixmapPtr winCreatePixmapNativeGDI (ScreenPtr pScreen, int iWidth, int iHeight, - int iDepth, unsigned usage_hint) + int iDepth, unsigned class) { winPrivPixmapPtr pPixmapPriv = NULL; PixmapPtr pPixmap = NULL; @@ -72,13 +72,13 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen, #if CYGDEBUG winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n", - iWidth, iHeight, iDepth, usage_hint, + iWidth, iHeight, iDepth, class, PixmapBytePad (iWidth, iDepth)); #endif /* Setup pixmap values */ pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; + pPixmap->drawable.class = class; pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.depth = iDepth; pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth); @@ -91,7 +91,6 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen, pPixmap->devKind = 0; pPixmap->refcnt = 1; pPixmap->devPrivate.ptr = NULL; - pPixmap->usage_hint = usage_hint; /* Pixmap privates are allocated by AllocatePixmap */ pPixmapPriv = winGetPixmapPriv (pPixmap); |