xf86-video-ati: Branch 'ati-6.6-branch'

[Michel Daenzer]

 src/radeon_exa_render.c |    4 ++--
 src/radeon_render.c     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 355fa6a5f01183ce2c6fadc7f1e8cb683b9adfd4 (from e82fa0766a2a7bcf090ad576cf0810c510a2942b)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Oct 23 10:12:32 2006 +0200

    radeon: Repeat should always work with 1x1.

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 4fc8089..54b0fe1 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -204,7 +204,7 @@ static Bool R100CheckCompositeTexture(Pi
 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
 			(int)pPict->format));
 
-    if (pPict->repeat)
+    if (pPict->repeat && ((w != 1) || (h != 1)))
 	RADEON_FALLBACK(("Repeat unsupported (%dx%d)\n", w, h));
 
     if (pPict->filter != PictFilterNearest &&
@@ -459,7 +459,7 @@ static Bool R200CheckCompositeTexture(Pi
 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
 			 (int)pPict->format));
 
-    if (pPict->repeat)
+    if (pPict->repeat && ((w != 1) || (h != 1)))
 	RADEON_FALLBACK(("Repeat unsupported (%dx%d)\n", w, h));
 
     if (pPict->filter != PictFilterNearest &&
diff --git a/src/radeon_render.c b/src/radeon_render.c
index c0a20f5..7d761f1 100644
--- a/src/radeon_render.c
+++ b/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))