svn merge ^/branches/released .

2 files changed, 4 insertions, 3 deletions

diff --git a/xorg-server/hw/dmx/dmxpixmap.c b/xorg-server/hw/dmx/dmxpixmap.c
index 9a098777d..119dd1134 100644
--- a/xorg-server/hw/dmx/dmxpixmap.c
+++ b/xorg-server/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 class)

+			  unsigned usage_hint)

 {

     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 = class;

+    pPixmap->drawable.class = 0;

     pPixmap->drawable.pScreen = pScreen;

     pPixmap->drawable.depth = depth;

     pPixmap->drawable.bitsPerPixel = bpp;

@@ -116,6 +116,7 @@ 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;

diff --git a/xorg-server/hw/dmx/dmxpixmap.h b/xorg-server/hw/dmx/dmxpixmap.h
index 70aa5075c..a41918ce4 100644
--- a/xorg-server/hw/dmx/dmxpixmap.h
+++ b/xorg-server/hw/dmx/dmxpixmap.h
@@ -50,7 +50,7 @@ extern Bool      dmxInitPixmap(ScreenPtr pScreen);
 

 extern PixmapPtr dmxCreatePixmap(ScreenPtr pScreen,

 				 int width, int height, int depth,

-				 unsigned class);

+				 unsigned usage_hint);

 extern Bool      dmxDestroyPixmap(PixmapPtr pPixmap);

 extern RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap);