diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-10 12:57:09 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-10 12:57:09 +0000 |
| commit | ae312a8a8042b4b23ffc652acf3b5cad1b3f07ca (patch) | |
| tree | f54be422d872ddfcc3fa96dafe8c40288548ef22 /xorg-server/exa/exa_migration_mixed.c | |
| parent | b5f8cc93800ce69d2c984081471b05e650ba9ddd (diff) | |
| parent | f81bb3160c5f39d8f7ad329e99865af88f02b96a (diff) | |
| download | vcxsrv-ae312a8a8042b4b23ffc652acf3b5cad1b3f07ca.tar.gz vcxsrv-ae312a8a8042b4b23ffc652acf3b5cad1b3f07ca.tar.bz2 vcxsrv-ae312a8a8042b4b23ffc652acf3b5cad1b3f07ca.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/exa/exa_migration_mixed.c')
| -rw-r--r-- | xorg-server/exa/exa_migration_mixed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c index 9489b2927..00227e3c4 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 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)
|