Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-03-17 16:59:12 +08:00 committed by Zhenyu Wang
parent 81df48d8d1
commit d72e18c109
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i830_dri.c
View File

@ -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;

2
src/i830_driver.c
View File

@ -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")) {

2
src/i915_render.c
View File

@ -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");