qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fixes from X.Org ati-6.6-branch head.

Browse Source
This commit is contained in:
matthieu 2006-11-27 00:04:55 +00:00
parent e52ba56f75
commit f9fcc8e487
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver/xf86-video-ati/src/radeon_exa_render.c
View File

@ -204,8 +204,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit)
RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
(int)pPict->format));
if (pPict->repeat && ((w & (w - 1)) != 0 || (h & (h - 1)) != 0))
RADEON_FALLBACK(("NPOT repeat unsupported (%dx%d)\n", w, h));
if (pPict->repeat && ((w != 1) || (h != 1)))
RADEON_FALLBACK(("Repeat unsupported (%dx%d)\n", w, h));
if (pPict->filter != PictFilterNearest &&
pPict->filter != PictFilterBilinear)
@ -459,8 +459,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit)
RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
(int)pPict->format));
if (pPict->repeat && ((w & (w - 1)) != 0 || (h & (h - 1)) != 0))
RADEON_FALLBACK(("NPOT repeat unsupported (%dx%d)\n", w, h));
if (pPict->repeat && ((w != 1) || (h != 1)))
RADEON_FALLBACK(("Repeat unsupported (%dx%d)\n", w, h));
if (pPict->filter != PictFilterNearest &&
pPict->filter != PictFilterBilinear)

4
driver/xf86-video-ati/src/radeon_render.c
View File

@ -393,7 +393,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
ACCEL_PREAMBLE();
/* render repeat is broken - fix in stable tree by falling back */
if (flags & XAA_RENDER_REPEAT)
if ((flags & XAA_RENDER_REPEAT) && ((width != 1) || (height != 1)))
return FALSE;
if ((width > 2048) || (height > 2048))
@ -730,7 +730,7 @@ static Bool FUNC_NAME(R200SetupTexture)(
ACCEL_PREAMBLE();
/* render repeat is broken - fix in stable tree by falling back */
if (flags & XAA_RENDER_REPEAT)
if ((flags & XAA_RENDER_REPEAT) && ((width != 1) || (height != 1)))
return FALSE;
if ((width > 2048) || (height > 2048))