diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-06 13:10:16 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-07 18:41:30 +0200 |
| commit | 6c9d7ed61bc4a19d21c53717b8af3d90b5d82ca9 (patch) | |
| tree | 4d5e487ee027d6a17fe76717beb3969f72dc2193 /exa/exa_migration.c | |
| parent | 962eddd7a2863a8475f5fd8107d3112df08d1172 (diff) | |
EXA: Hide pixmap pointer outside of exaPrepare/FinishAccess whenever possible.
We finally want to catch all cases where the pixmap pointer is dereferenced
outside of exaPrepare/FinishAccess.
Also fix a couple of such cases exposed by this change.
Diffstat (limited to 'exa/exa_migration.c')
| -rw-r--r-- | exa/exa_migration.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/exa/exa_migration.c b/exa/exa_migration.c index f48e93a78..ace90765d 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -323,10 +323,8 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate) pPixmap->drawable.height, exaPixmapIsDirty(pPixmap) ? 'd' : 'c')); - if (pExaScr->hideOffscreenPixmapData) - pPixmap->devPrivate.ptr = NULL; - else - pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr; + pExaPixmap->offscreen = TRUE; + pPixmap->devKind = pExaPixmap->fb_pitch; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; } @@ -365,7 +363,8 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate) pPixmap->drawable.height, exaPixmapIsDirty(pPixmap) ? 'd' : 'c')); - pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr; + pExaPixmap->offscreen = FALSE; + pPixmap->devKind = pExaPixmap->sys_pitch; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; } |