svn merge ^/branches/released .

1 files changed, 6 insertions, 4 deletions

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index e73a2f02d..80d3252d2 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -30,7 +30,7 @@
 

 PixmapPtr

 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,

-		   unsigned class)

+		   unsigned usage_hint)

 {

     PixmapPtr	pPixmap;

     size_t	datasize;

@@ -54,7 +54,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     if (!pPixmap)

 	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;

@@ -78,12 +78,14 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->screen_y = 0;

 #endif

 

+    pPixmap->usage_hint = usage_hint;

+

     return pPixmap;

 }

 

 PixmapPtr

 fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     int	bpp;

     bpp = BitsPerPixel (depth);

@@ -91,7 +93,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
     if (bpp == 32 && depth <= 24)

 	bpp = fbGetScreenPrivate(pScreen)->pix32bpp;

 #endif

-    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, class);

+    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);

 }

 

 Bool