summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-03-24 14:59:20 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-03-24 16:42:05 +0000
commit5537079c29a56133446f1874d24d9e6516825edb (patch)
tree53f9e2d2502dafafc7612fc2229a880df356ba26
parent90a971c60769781f53827b469a9be3aab14cf71c (diff)
downloadxf86-video-intel-5537079c29a56133446f1874d24d9e6516825edb.tar.gz
xf86-video-intel-5537079c29a56133446f1874d24d9e6516825edb.tar.bz2
xf86-video-intel-5537079c29a56133446f1874d24d9e6516825edb.zip
uxa: After filling the alpha channel xrgb src is compatible with argb dst.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--uxa/uxa-render.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index bcfe20eb0..30934d0d8 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -963,6 +963,10 @@ 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... */
+ if (dst->format == PICT_a8r8g8b8 && src->format == PICT_x8r8g8b8)
+ return 1;
} else if (op == PictOpOver) {
if (src->alphaMap || dst->alphaMap)
return 0;