svn merge ^/branches/released .

3 files changed, 7 insertions, 9 deletions

diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index 29eecadb3..a33cc40ce 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1598,11 +1598,11 @@ fbPictureInit (ScreenPtr pScreen,
 

 extern _X_EXPORT PixmapPtr

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

-		   unsigned usage_hint);

+		   unsigned class);

 

 extern _X_EXPORT PixmapPtr

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

-		unsigned usage_hint);

+		unsigned class);

 

 extern _X_EXPORT Bool

 fbDestroyPixmap (PixmapPtr pPixmap);

diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c
index 748a0ec04..b402a2357 100644
--- a/xorg-server/fb/fb24_32.c
+++ b/xorg-server/fb/fb24_32.c
@@ -546,7 +546,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
     pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,

 				     pOldTile->drawable.height,

 				     pOldTile->drawable.depth,

-				     pOldTile->usage_hint);

+				     pOldTile->drawable.class);

     if (!pNewTile)

 	return 0;

     fbGetDrawable (&pOldTile->drawable, 

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 80d3252d2..e73a2f02d 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 usage_hint)

+		   unsigned class)

 {

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

+    pPixmap->drawable.class = class;

     pPixmap->drawable.pScreen = pScreen;

     pPixmap->drawable.depth = depth;

     pPixmap->drawable.bitsPerPixel = bpp;

@@ -78,14 +78,12 @@ 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 usage_hint)

+		unsigned class)

 {

     int	bpp;

     bpp = BitsPerPixel (depth);

@@ -93,7 +91,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, usage_hint);

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

 }

 

 Bool