From 3539da23589a2e580bd94aa09ed0da0830fadf5c Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sat, 15 Mar 2008 22:59:00 -0300 Subject: [PATCH] Compile warning fixes. Move some declarations and don't declare an extra variable with the same name, to fix warnings about mixed declarations and code. --- src/i830_dri.c | 2 +- src/i830_driver.c | 2 +- src/i915_render.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i830_dri.c b/src/i830_dri.c index 5d2539e..3493eb9 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -747,12 +747,12 @@ static void I830InitTextureHeap(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); + drmI830MemInitHeap drmHeap; if (pI830->textures == NULL) return; /* Start up the simple memory manager for agp space */ - drmI830MemInitHeap drmHeap; drmHeap.region = I830_MEM_REGION_AGP; drmHeap.start = 0; drmHeap.size = pI830->textures->size; diff --git a/src/i830_driver.c b/src/i830_driver.c index 088989d..2d197d0 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1479,7 +1479,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) pI830->useEXA = FALSE; #endif #if defined(I830_USE_XAA) && defined(I830_USE_EXA) - int from = X_DEFAULT; + from = X_DEFAULT; if ((s = (char *)xf86GetOptValString(pI830->Options, OPTION_ACCELMETHOD))) { if (!xf86NameCmp(s, "EXA")) { diff --git a/src/i915_render.c b/src/i915_render.c index fe02e63..b15beef 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -319,6 +319,7 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, uint32_t dst_format, dst_offset, dst_pitch; uint32_t blendctl; int out_reg = FS_OC; + FS_LOCALS(20); IntelEmitInvarientState(pScrn); *pI830->last_3d = LAST_3D_RENDER; @@ -327,7 +328,6 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, return FALSE; dst_offset = intel_get_pixmap_offset(pDst); dst_pitch = intel_get_pixmap_pitch(pDst); - FS_LOCALS(20); if (!i915_texture_setup(pSrcPicture, pSrc, 0)) I830FALLBACK("fail to setup src texture\n"); -- 1.5.3.2