Fix software fall-back code for convolution filters

This commit is contained in:
David Reveman 2006-04-10 14:24:51 +00:00
parent 8f965d63a8
commit 4d755fe142
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2006-04-10 David Reveman <davidr@novell.com>
* fb/fbcompose.c (fbFetchTransformed): Shift down after multiplication
with filter parameters that are be in 16.16 fixed point.
2006-04-09 David Reveman <davidr@novell.com>
* GL/glx/glxcmds.c (DoMakeCurrent): Reset pending state when making a

View File

@ -1,5 +1,5 @@
/*
* $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26.6.4 2006/02/02 02:35:00 davidr Exp $
* $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26.6.5 2006/03/30 16:38:16 davidr Exp $
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -3695,6 +3695,11 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
}
}
satot >>= 16;
srtot >>= 16;
sgtot >>= 16;
sbtot >>= 16;
if (satot < 0) satot = 0; else if (satot > 0xff) satot = 0xff;
if (srtot < 0) srtot = 0; else if (srtot > 0xff) srtot = 0xff;
if (sgtot < 0) sgtot = 0; else if (sgtot > 0xff) sgtot = 0xff;