diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-06-21 09:38:47 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-06-21 09:38:47 +0200 |
| commit | a01c01787cfbe3706ae7747cde1657abd79ecdaa (patch) | |
| tree | 5d1d8d5a7c6ec97c18ad0bba4a11514ca6222bab /src/radeon_exa.c | |
| parent | 79d1c573133e64ddf4446b6bb0eaab4a5a6c73ab (diff) | |
Bug #7283: Build fixes for !defined(XF86DRI).
Thanks to Matthieu Herrb for pointing out some of these.
Diffstat (limited to 'src/radeon_exa.c')
| -rw-r--r-- | src/radeon_exa.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 0cf86f54..5bbce877 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -197,7 +197,7 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index) RINFO_FROM_SCREEN(pPix->drawable.pScreen); unsigned char *RADEONMMIO = info->MMIO; CARD32 offset = exaGetPixmapOffset(pPix); - int bpp, rc, soff; + int bpp, soff; CARD32 size, flags; /* Front buffer is always set with proper swappers */ @@ -231,6 +231,7 @@ static Bool RADEONPrepareAccess(PixmapPtr pPix, int index) #if defined(XF86DRI) if (info->directRenderingEnabled && info->allowColorTiling) { drmRadeonSurfaceAlloc drmsurfalloc; + int rc; drmsurfalloc.address = offset; drmsurfalloc.size = size; @@ -367,9 +368,7 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; RADEONInfoPtr info = RADEONPTR(pScrn); int cpp = info->CurrentLayout.pixel_bytes; - int depthCpp = (info->depthBits - 8) / 4; - int l; - int next, screen_size; + int screen_size; int byteStride = pScrn->displayWidth * cpp; if (info->exa != NULL) { @@ -401,7 +400,7 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen) #if defined(XF86DRI) if (info->directRenderingEnabled) { - int depth_size; + int depthCpp = (info->depthBits - 8) / 4, l, next, depth_size; info->frontOffset = 0; info->frontPitch = pScrn->displayWidth; |