diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-27 00:04:57 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-27 00:04:57 +0000 |
| commit | 84a7f12be4f04230e5eb458afad8b4271b2478a2 (patch) | |
| tree | b44e57e567c7833e6413d79e93588f175fdb6087 | |
| parent | 304d8cf99795855bbc2e8a564a9b475c0621758e (diff) | |
Bug fixes from X.Org ati-6.6-branch head.
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_exa_render.c | 8 | ||||
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_render.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/driver/xf86-video-ati/src/radeon_exa_render.c b/driver/xf86-video-ati/src/radeon_exa_render.c index 98b8dfdd6..54b0fe13b 100644 --- a/driver/xf86-video-ati/src/radeon_exa_render.c +++ b/driver/xf86-video-ati/src/radeon_exa_render.c @@ -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) diff --git a/driver/xf86-video-ati/src/radeon_render.c b/driver/xf86-video-ati/src/radeon_render.c index c0a20f5a5..7d761f164 100644 --- a/driver/xf86-video-ati/src/radeon_render.c +++ b/driver/xf86-video-ati/src/radeon_render.c @@ -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)) |