diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-04-11 09:52:37 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-21 12:59:20 +0100 |
| commit | e7a9e30fd20a7c2a526783726d0a76b8a04b053a (patch) | |
| tree | aac9ccad8e226600dd13acc839ecf4b62e0b8f50 | |
| parent | 738367ac9b6179593a38074d0105de206cbed296 (diff) | |
xaa: convert pScrn->pScreen to use accessor.
This uses a standard conversion function to do the conversion.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | hw/xfree86/xaa/xaaInit.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/xaa/xaaPCache.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 9a5d3fbe7..48d0605fa 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -92,7 +92,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec) return; if (infoRec->ClosePixmapCache) - (*infoRec->ClosePixmapCache) (infoRec->pScrn->pScreen); + (*infoRec->ClosePixmapCache) (xf86ScrnToScreen(infoRec->pScrn)); free(infoRec->PreAllocMem); diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index a168ceb78..53460b31e 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -2015,7 +2015,7 @@ XAAWriteBitmapToCacheLinear(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned char *src, int srcwidth, int fg, int bg) { - ScreenPtr pScreen = pScrn->pScreen; + ScreenPtr pScreen = xf86ScrnToScreen(pScrn); PixmapPtr pScreenPix, pDstPix; ChangeGCVal gcvals[2]; GCPtr pGC; @@ -2061,7 +2061,7 @@ XAAWritePixmapToCacheLinear(ScrnInfoPtr pScrn, unsigned char *src, int srcwidth, int bpp, int depth) { - ScreenPtr pScreen = pScrn->pScreen; + ScreenPtr pScreen = xf86ScrnToScreen(pScrn); PixmapPtr pScreenPix, pDstPix; GCPtr pGC; |