diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-11-26 11:02:30 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2018-11-26 11:02:30 -0800 |
| commit | 4017c6e91f8938f1f1617e53e30ee1d3d10d490c (patch) | |
| tree | 9af17b88e297f629722bb57d56a68e3890b7902a /src/mga_storm.c | |
| parent | c5922dcc3ff26c9b1291e90ecedee35f97bc51c8 (diff) | |
Convert most HAVE_XAA_H conditional compilation labels to USE_XAA
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src/mga_storm.c')
| -rw-r--r-- | src/mga_storm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mga_storm.c b/src/mga_storm.c index 28349c2..08dfa20 100644 --- a/src/mga_storm.c +++ b/src/mga_storm.c @@ -57,7 +57,7 @@ do { \ XAAMoveDWORDS((d),(s),(c)); \ } while (0) -#ifdef HAVE_XAA_H +#ifdef USE_XAA static void mgaSetupForSolidFill( ScrnInfoPtr pScrn, int color, int rop, unsigned int planemask ); @@ -572,29 +572,29 @@ MGASubsequentCPUToScreenTexture ( Bool mgaAccelInit( ScreenPtr pScreen ) { -#ifdef HAVE_XAA_H +#ifdef USE_XAA XAAInfoRecPtr infoPtr; #endif ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); MGAPtr pMga = MGAPTR(pScrn); // int maxFastBlitMem, maxlines; -#ifdef HAVE_XAA_H +#ifdef USE_XAA int maxFastBlitMem; -#endif /* HAVE_XAA_H */ +#endif /* USE_XAA */ int maxlines; -#if defined(HAVE_XAA_H) && defined(RENDER) +#if defined(USE_XAA) && defined(RENDER) Bool doRender = FALSE; -#endif /* defined(HAVE_XAA_H) && defined(RENDER) */ +#endif /* defined(USE_XAA) && defined(RENDER) */ BoxRec AvailFBArea; -#ifdef HAVE_XAA_H +#ifdef USE_XAA int i; -#endif /* HAVE_XAA_H */ +#endif /* USE_XAA */ pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3); if(!pMga->ScratchBuffer) return FALSE; -#ifdef HAVE_XAA_H +#ifdef USE_XAA pMga->AccelInfoRec = infoPtr = XAACreateInfoRec(); if(!infoPtr) return FALSE; #endif @@ -630,7 +630,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) pMga->AtypeNoBLK = MGAAtypeNoBLK; } -#ifdef HAVE_XAA_H +#ifdef USE_XAA /* fill out infoPtr here */ infoPtr->Flags = PIXMAP_CACHE | OFFSCREEN_PIXMAPS | @@ -937,7 +937,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) } -#ifdef HAVE_XAA_H +#ifdef USE_XAA for (i = 0; i < pScrn->numEntities; i++) { if (xf86IsEntityShared(pScrn->entityList[i])) { infoPtr->RestoreAccelState = mgaRestoreAccelState; @@ -976,7 +976,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) } -#ifdef HAVE_XAA_H +#ifdef USE_XAA /* Support for multiscreen */ static void mgaRestoreAccelState(ScrnInfoPtr pScrn) { @@ -1105,7 +1105,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn ) opmode &= ~0x30000; #endif -#ifdef HAVE_XAA_H +#ifdef USE_XAA pMga->SetupForSolidFill = mgaSetupForSolidFill; pMga->SubsequentSolidFillRect = mgaSubsequentSolidFillRect; pMga->RestoreAccelState = mgaRestoreAccelState; @@ -1184,7 +1184,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn ) } -#ifdef HAVE_XAA_H +#ifdef USE_XAA static void MGASetClippingRectangle( ScrnInfoPtr pScrn, |