summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-01-27 20:33:08 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-01-27 20:35:45 +0000
commit918151a7955c26174db80b775205f6ffb4f44ab6 (patch)
treeb17d65c57d5fd222418c597b21cd4636ad4166ea
parent197cb08a2d54cabbfe97454d7db85cfe1f5f27ba (diff)
downloadxf86-video-intel-918151a7955c26174db80b775205f6ffb4f44ab6.tar.gz
xf86-video-intel-918151a7955c26174db80b775205f6ffb4f44ab6.tar.bz2
xf86-video-intel-918151a7955c26174db80b775205f6ffb4f44ab6.zip
uxa: Fix compatible_formats() for OVER
In separating the boolean logic out into a separate function, dc6522dd, I reversed the sense of one particular test: src->format == dst->format The OVER optimisation is only valid if the src and dst formats match, but not always. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--uxa/uxa-render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 512ac02d8..68b406e91 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -994,8 +994,8 @@ compatible_formats (CARD8 op, PicturePtr dst, PicturePtr src)
if (src->alphaMap || dst->alphaMap)
return 0;
- if (src->format == dst->format)
- return 1;
+ if (src->format != dst->format)
+ return 0;
if (src->format == PICT_x8r8g8b8 || src->format == PICT_x8b8g8r8)
return 1;