diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-25 14:33:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-25 14:33:36 +0000 |
| commit | 311ab924cacb3353066bf25f23208a315ac06b9d (patch) | |
| tree | 4562209dc2dba361da4eb3bb7bea923d892f1a48 /xorg-server | |
| parent | 0412ee015982ea1ab7cbe353f20b24530d2d8048 (diff) | |
| parent | c6539c9f45372fb6518bff17a781effd654bd3f0 (diff) | |
| download | vcxsrv-311ab924cacb3353066bf25f23208a315ac06b9d.tar.gz vcxsrv-311ab924cacb3353066bf25f23208a315ac06b9d.tar.bz2 vcxsrv-311ab924cacb3353066bf25f23208a315ac06b9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | xorg-server/exa/exa_unaccel.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 10713f89b..b81d843f9 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/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/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c index 75c341adf..6cdfa2810 100644 --- a/xorg-server/exa/exa_unaccel.c +++ b/xorg-server/exa/exa_unaccel.c @@ -748,6 +748,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) return pixel;
}
case 8:
+ case 4:
+ case 1:
{
CARD8 pixel;
|