diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-12-22 11:45:36 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-12-22 11:38:05 -0800 |
| commit | e06fa804009798ea95efa8babaabb0228dfdfe65 (patch) | |
| tree | d59a70f0d8adbaa028ad9e62e6665f43f90486e2 | |
| parent | 56d9c736f0c450bffd43300107689eb6dd1ea70b (diff) | |
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@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | exa/exa_unaccel.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 6c677c7a1..b4c0f8351 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 a078cc114..d3c405fb1 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; |