diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
| commit | 6e973f9f133979796ca35d275470255271f39fce (patch) | |
| tree | d2ea3c36dda5d95b6e52b831daab6cbfb1dd1fd3 /xorg-server/hw/xnest/Pixmap.c | |
| parent | f42328963ef48163c38adf72c067078eaa717cff (diff) | |
| parent | eca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff) | |
| download | vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.gz vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.bz2 vcxsrv-6e973f9f133979796ca35d275470255271f39fce.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest/Pixmap.c')
| -rw-r--r-- | xorg-server/hw/xnest/Pixmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xnest/Pixmap.c b/xorg-server/hw/xnest/Pixmap.c index efb2774d3..da81a1d06 100644 --- a/xorg-server/hw/xnest/Pixmap.c +++ b/xorg-server/hw/xnest/Pixmap.c @@ -37,7 +37,7 @@ DevPrivateKeyRec xnestPixmapPrivateKeyRec; PixmapPtr
xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
- unsigned class)
+ unsigned usage_hint)
{
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 = class;
+ pPixmap->drawable.class = 0;
pPixmap->drawable.depth = depth;
pPixmap->drawable.bitsPerPixel = depth;
pPixmap->drawable.id = 0;
@@ -57,6 +57,7 @@ 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,
|