svn merge ^/branches/released .

2 files changed, 3 insertions, 4 deletions

diff --git a/xorg-server/hw/xnest/Pixmap.c b/xorg-server/hw/xnest/Pixmap.c
index da81a1d06..efb2774d3 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 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/xorg-server/hw/xnest/XNPixmap.h b/xorg-server/hw/xnest/XNPixmap.h
index 0d7c6b61e..c9223e5ce 100644
--- a/xorg-server/hw/xnest/XNPixmap.h
+++ b/xorg-server/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);