frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dave Airlie 2012-04-11 09:52:37 +01:00 committed by Dave Airlie
parent 738367ac9b
commit e7a9e30fd2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/xaa/xaaInit.c
View File

@ -92,7 +92,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
return; return;
if (infoRec->ClosePixmapCache) if (infoRec->ClosePixmapCache)
(*infoRec->ClosePixmapCache) (infoRec->pScrn->pScreen); (*infoRec->ClosePixmapCache) (xf86ScrnToScreen(infoRec->pScrn));
free(infoRec->PreAllocMem); free(infoRec->PreAllocMem);

4
hw/xfree86/xaa/xaaPCache.c
View File

@ -2015,7 +2015,7 @@ XAAWriteBitmapToCacheLinear(ScrnInfoPtr pScrn,
int x, int y, int w, int h, int x, int y, int w, int h,
unsigned char *src, int srcwidth, int fg, int bg) unsigned char *src, int srcwidth, int fg, int bg)
{ {
ScreenPtr pScreen = pScrn->pScreen; ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
PixmapPtr pScreenPix, pDstPix; PixmapPtr pScreenPix, pDstPix;
ChangeGCVal gcvals[2]; ChangeGCVal gcvals[2];
GCPtr pGC; GCPtr pGC;
@ -2061,7 +2061,7 @@ XAAWritePixmapToCacheLinear(ScrnInfoPtr pScrn,
unsigned char *src, unsigned char *src,
int srcwidth, int bpp, int depth) int srcwidth, int bpp, int depth)
{ {
ScreenPtr pScreen = pScrn->pScreen; ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
PixmapPtr pScreenPix, pDstPix; PixmapPtr pScreenPix, pDstPix;
GCPtr pGC; GCPtr pGC;