xf86-video-intel: 2 commits - src/i915_render.c uxa/uxa-render.c

[Chris Wilson]

 src/i915_render.c |    2 --
 uxa/uxa-render.c  |    4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 737de9a779d05fe6fb1efe1904fda2cc452ff137
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 14 23:48:27 2010 +0100

    uxa: Disable compatible src xrgb and dst argb
    
    I'm seeing garbage alpha for rendercheck blend:
    
      x8r8g8b8a 10x10 SRC ar8g8b8a
    
    so disable blitting until I work out if we can fast-path it.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 8b6d4c7..010d663 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -1326,9 +1326,11 @@ compatible_formats (CARD8 op, PicturePtr dst, PicturePtr src)
 		if (src->format == PICT_a8b8g8r8 && dst->format == PICT_x8b8g8r8)
 			return 1;
 
-		/* xrgb is promoted to argb during image upload... */
+		/* XXX xrgb is promoted to argb during image upload... */
+#if 0
 		if (dst->format == PICT_a8r8g8b8 && src->format == PICT_x8r8g8b8)
 			return 1;
+#endif
 	} else if (op == PictOpOver) {
 		if (src->format != dst->format)
 			return 0;
commit 271240fd477b11885947da32868bc77151681559
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 14 23:38:02 2010 +0100

    i915: Remove a couple of unsupported 16bpp no-alpha tex formats
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_render.c b/src/i915_render.c
index 1d89746..baaa58d 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -88,9 +88,7 @@ static struct formatinfo i915_tex_formats[] = {
 	{PICT_a2b10g10r10, MAPSURF_32BIT | MT_32BIT_ABGR2101010},
 	{PICT_r5g6b5, MAPSURF_16BIT | MT_16BIT_RGB565},
 	{PICT_a1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555},
-	{PICT_x1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555},
 	{PICT_a4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444},
-	{PICT_x4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444},
 };
 
 static uint32_t i915_get_blend_cntl(int op, PicturePtr mask,