From 1564c82417d201de5b9a5ec5e7aa4ef14c45fbad Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 18:37:45 -0500 Subject: dix: Remove usage_hint from pixmaps, store it in ->drawable.class The class field was unused for pixmaps, and we don't have enough classes to justify a whole uint32 anyway. Reviewed-by: Soren Sandmann Signed-off-by: Adam Jackson --- exa/exa.h | 2 +- exa/exa_classic.c | 4 ++-- exa/exa_driver.c | 6 +++--- exa/exa_migration_mixed.c | 4 ++-- exa/exa_mixed.c | 4 ++-- exa/exa_priv.h | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'exa') diff --git a/exa/exa.h b/exa/exa.h index 8c93d156f..6de63008e 100644 --- a/exa/exa.h +++ b/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 usage_hint, int bitsPerPixel, + int depth, int class, int bitsPerPixel, int *new_fb_pitch); /** @} */ } ExaDriverRec, *ExaDriverPtr; diff --git a/exa/exa_classic.c b/exa/exa_classic.c index 169ce3aac..640b26a12 100644 --- a/exa/exa_classic.c +++ b/exa/exa_classic.c @@ -54,7 +54,7 @@ ExaGetPixmapAddress(PixmapPtr p) */ PixmapPtr exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth, - unsigned usage_hint) + unsigned class) { 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, usage_hint); + pPixmap = pScreen->CreatePixmap (pScreen, w, h, depth, class); swap(pExaScr, pScreen, CreatePixmap); if (!pPixmap) diff --git a/exa/exa_driver.c b/exa/exa_driver.c index b9903d1bc..4d2a1a5df 100644 --- a/exa/exa_driver.c +++ b/exa/exa_driver.c @@ -48,7 +48,7 @@ ExaGetPixmapAddress(PixmapPtr p) */ PixmapPtr exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth, - unsigned usage_hint) + unsigned class) { 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, usage_hint); + pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, class); 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, usage_hint, bpp, &new_pitch); + pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch); paddedWidth = pExaPixmap->fb_pitch = new_pitch; } else { diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c index fb4715135..a563357be 100644 --- a/exa/exa_migration_mixed.c +++ b/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 usage_hint = pPixmap->usage_hint; + int class = pPixmap->drawable.class; 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, usage_hint, bpp, &new_pitch); + pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, class, bpp, &new_pitch); paddedWidth = pExaPixmap->fb_pitch = new_pitch; } else { if (paddedWidth < pExaPixmap->fb_pitch) diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index fd1afb246..24fce7645 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -47,7 +47,7 @@ ExaGetPixmapAddress(PixmapPtr p) */ PixmapPtr exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, - unsigned usage_hint) + unsigned class) { 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, usage_hint); + pPixmap = pScreen->CreatePixmap(pScreen, 0, 0, depth, class); swap(pExaScr, pScreen, CreatePixmap); if (!pPixmap) diff --git a/exa/exa_priv.h b/exa/exa_priv.h index e5d90d468..1f6dede94 100644 --- a/exa/exa_priv.h +++ b/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 usage_hint); + unsigned class); 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 usage_hint); + unsigned class); 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 usage_hint); + unsigned class); Bool exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, -- cgit v1.2.3