svn merge ^/branches/released .

6 files changed, 13 insertions, 13 deletions

diff --git a/xorg-server/exa/exa.h b/xorg-server/exa/exa.h
index b65118883..3109607d8 100644
--- a/xorg-server/exa/exa.h
+++ b/xorg-server/exa/exa.h
@@ -712,7 +712,7 @@ typedef struct _ExaDriver {
      * driver MUST fill out new_fb_pitch with valid pitch of pixmap

      */

     void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,

-			   int depth, int class, int bitsPerPixel,

+			   int depth, int usage_hint, int bitsPerPixel,

 			   int *new_fb_pitch);

     /** @} */

 } ExaDriverRec, *ExaDriverPtr;

diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c
index 809b3f660..1a1467848 100644
--- a/xorg-server/exa/exa_classic.c
+++ b/xorg-server/exa/exa_classic.c
@@ -54,7 +54,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -66,7 +66,7 @@ exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

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

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

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

diff --git a/xorg-server/exa/exa_driver.c b/xorg-server/exa/exa_driver.c
index 8893452a8..bfc89295f 100644
--- a/xorg-server/exa/exa_driver.c
+++ b/xorg-server/exa/exa_driver.c
@@ -48,7 +48,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -60,7 +60,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

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

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

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

@@ -78,7 +78,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
 

     if (pExaScr->info->CreatePixmap2) {

 	int new_pitch = 0;

-	pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch);

+	pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp, &new_pitch);

 	paddedWidth = pExaPixmap->fb_pitch = new_pitch;

     }

     else {

diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c
index 00227e3c4..9489b2927 100644
--- a/xorg-server/exa/exa_migration_mixed.c
+++ b/xorg-server/exa/exa_migration_mixed.c
@@ -39,7 +39,7 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
     ExaPixmapPriv(pPixmap);

     int w = pPixmap->drawable.width, h = pPixmap->drawable.height;

     int depth = pPixmap->drawable.depth, bpp = pPixmap->drawable.bitsPerPixel;

-    int class = pPixmap->drawable.class;

+    int usage_hint = pPixmap->usage_hint;

     int paddedWidth = pExaPixmap->sys_pitch;

 

     /* Already done. */

@@ -55,7 +55,7 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
 

     if (pExaScr->info->CreatePixmap2) {

 	int new_pitch = 0;

-        pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch);

+        pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp, &new_pitch);

 	paddedWidth = pExaPixmap->fb_pitch = new_pitch;

     } else {

 	if (paddedWidth < pExaPixmap->fb_pitch)

diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c
index 38700e900..188a7e0a6 100644
--- a/xorg-server/exa/exa_mixed.c
+++ b/xorg-server/exa/exa_mixed.c
@@ -47,7 +47,7 @@ ExaGetPixmapAddress(PixmapPtr p)
  */

 PixmapPtr

 exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class)

+		unsigned usage_hint)

 {

     PixmapPtr pPixmap;

     ExaPixmapPrivPtr	pExaPixmap;

@@ -59,7 +59,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
 	return NullPixmap;

 

     swap(pExaScr, pScreen, CreatePixmap);

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

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

     swap(pExaScr, pScreen, CreatePixmap);

 

     if (!pPixmap)

diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index 546a3e6e8..1b8cf294a 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -588,7 +588,7 @@ extern const GCFuncs exaGCFuncs;
 /* exa_classic.c */

 PixmapPtr

 exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, int depth,

@@ -603,7 +603,7 @@ exaPixmapHasGpuCopy_classic(PixmapPtr pPixmap);
 /* exa_driver.c */

 PixmapPtr

 exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, int depth,

@@ -618,7 +618,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap);
 /* exa_mixed.c */

 PixmapPtr

 exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,

-		unsigned class);

+		unsigned usage_hint);

 

 Bool

 exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,