xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Wed Dec 22 11:38:27 PST 2010
exa/exa_accel.c | 2 ++
exa/exa_unaccel.c | 2 ++
2 files changed, 4 insertions(+)
New commits:
commit e06fa804009798ea95efa8babaabb0228dfdfe65
Author: Michel Dänzer <daenzer at vmware.com>
Date: Wed Dec 22 11:45:36 2010 +0100
EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703).
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 .
Signed-off-by: Michel Dänzer <daenzer at vmware.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 6c677c7..b4c0f83 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
*(CARD16*)pExaPixmap->sys_ptr = pixel;
break;
case 8:
+ case 4:
+ case 1:
*(CARD8*)pExaPixmap->sys_ptr = pixel;
}
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index a078cc1..d3c405f 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -748,6 +748,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
return pixel;
}
case 8:
+ case 4:
+ case 1:
{
CARD8 pixel;
More information about the xorg-commit
mailing list