diff options
author | Maarten Maathuis <madman2003@gmail.com> | 2009-08-08 10:35:01 +0200 |
---|---|---|
committer | Maarten Maathuis <madman2003@gmail.com> | 2009-08-08 11:38:51 +0200 |
commit | 8b652435cd42929e2d187b353b3b20e798569356 (patch) | |
tree | 38ef2e89481b559a023f85b5d59d9a49dd0b7d67 /exa | |
parent | a73f95aa93634cf7ba2c7c9274a046b2df2adca7 (diff) |
exa: minor cleanup
Diffstat (limited to 'exa')
-rw-r--r-- | exa/exa_mixed.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 0d2552d8b..abfa95790 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -87,7 +87,6 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, pExaPixmap->area = NULL; pExaPixmap->offscreen = FALSE; - pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; pExaPixmap->fb_ptr = NULL; pExaPixmap->pDamage = NULL; @@ -95,19 +94,19 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, exaSetAccelBlock(pExaScr, pExaPixmap, w, h, bpp); + /* Avoid freeing sys_ptr. */ + pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; + + (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0, + paddedWidth, NULL); + + /* We want to be able to transfer the pixmap to driver memory later on. */ + pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; + /* A scratch pixmap will become a driver pixmap right away. */ if (!w || !h) { exaCreateDriverPixmap_mixed(pPixmap); } else { - /* Avoid freeing sys_ptr. */ - pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; - - (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0, - paddedWidth, NULL); - - /* We want to be able to copy the pixmap to driver memory later on. */ - pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; - /* Set up damage tracking */ pExaPixmap->pDamage = DamageCreate (NULL, NULL, DamageReportNone, TRUE, |