svn merge ^/branches/released .

9 files changed, 21 insertions, 18 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);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index a6266e725..0aa6f2cf4 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -369,13 +369,13 @@ VGAarbiterClearToBackground (
 }

 

 static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

 {

     PixmapPtr pPix;

 

     SCREEN_PROLOG ( CreatePixmap);

     VGAGet(pScreen);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

     VGAPut();

     SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 0f8416b71..13fde5e79 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -155,7 +155,7 @@ static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
 static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,

     int h, Bool generateExposures);

 static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,

-    int depth, unsigned int class);

+    int depth, unsigned int usage_hint);

 static Bool  VGAarbiterCreateGC(GCPtr pGC);

 static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);

 static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem

diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index c0617149a..ff1dd3d8b 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -34,7 +34,7 @@ static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,

 			int *pwidth, int nspans, char *pdstStart);

 static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,

-				 unsigned class);

+				 unsigned usage_hint);

 static Bool XAADestroyPixmap(PixmapPtr pPixmap);

 static Bool XAAEnterVT (int index, int flags);

 static void XAALeaveVT (int index, int flags);

@@ -331,7 +331,7 @@ XAAInitializeOffscreenDepths (ScreenPtr pScreen)
 }

 

 static PixmapPtr 

-XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

+XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

 {

     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

@@ -346,7 +346,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
 	XAAInitializeOffscreenDepths (pScreen);

 

     if(pScrn->vtSema &&

-	(class != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

+	(usage_hint != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

 	(infoRec->offscreenDepths & (1 << (depth - 1))) &&

 	(size >= MIN_OFFPIX_SIZE) && !SwitchedOut &&

 	(!infoRec->maxOffPixWidth || (w <= infoRec->maxOffPixWidth)) &&

@@ -379,7 +379,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
 	}

 

 	XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, class);

+	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, usage_hint);

 	XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

 	if (!pPix) {

@@ -411,7 +411,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)
     }

 BAILOUT:

     XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

     XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

     if(pPix) {

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, 

diff --git a/xorg-server/hw/xnest/XNPixmap.h b/xorg-server/hw/xnest/XNPixmap.h
index c9223e5ce..0d7c6b61e 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 class);

+			    int depth, unsigned usage_hint);

 Bool xnestDestroyPixmap(PixmapPtr pPixmap);

 RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap);

 

diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index e01955cb1..2dad44778 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -1036,7 +1036,7 @@ winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);
 

 PixmapPtr

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

-			  unsigned class);

+			  unsigned usage_hint);

 

 Bool

 winDestroyPixmapNativeGDI (PixmapPtr pPixmap);

diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index d174d70d3..2af95f225 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -57,7 +57,7 @@ winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
 PixmapPtr

 winCreatePixmapNativeGDI (ScreenPtr pScreen,

 			  int iWidth, int iHeight,

-			  int iDepth, unsigned class)

+			  int iDepth, unsigned usage_hint)

 {

   winPrivPixmapPtr	pPixmapPriv = NULL;

   PixmapPtr		pPixmap = NULL;

@@ -71,12 +71,12 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
     }

 

   winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",

-	  iWidth, iHeight, iDepth, class,

+	  iWidth, iHeight, iDepth, usage_hint,

 	  PixmapBytePad (iWidth, iDepth));

 

   /* Setup pixmap values */

   pPixmap->drawable.type = DRAWABLE_PIXMAP;

-  pPixmap->drawable.class = class;

+  pPixmap->drawable.class = 0;

   pPixmap->drawable.pScreen = pScreen;

   pPixmap->drawable.depth = iDepth;

   pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);

@@ -89,6 +89,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
   pPixmap->devKind = 0;

   pPixmap->refcnt = 1;

   pPixmap->devPrivate.ptr = NULL;

+  pPixmap->usage_hint = usage_hint;

 

   /* Pixmap privates are allocated by AllocatePixmap */

   pPixmapPriv = winGetPixmapPriv (pPixmap);