fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-17 17:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a chunk of code that somehow got lost when moving code from the xserver

Browse source 
tree
This commit is contained in:
David Reveman 2006-02-02 02:20:24 +00:00
parent a31e4cfa51
commit 2b071a3ff9
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2006-02-01 David Reveman <davidr@novell.com>
* fb/fbcompose.c (fbCompositeRect): Add a chunk of code that somehow
got lost when moving code from the xserver tree.
* fb/fbbltone.c: Negative stride fix.
* hw/xgl/xglglx.h:

30
fb/fbcompose.c
View file

@ -1,5 +1,5 @@
/*
* $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26.6.1 2006/01/18 07:21:42 airlied Exp $
* $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26.6.2 2006/01/27 04:34:28 airlied Exp $
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -3873,6 +3873,34 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
fetchDest = NULL;
}
else
{
fetchDest = fbFetch;
store = fbStore;
switch (data->op) {
case PictOpClear:
case PictOpSrc:
fetchDest = NULL;
/* fall-through */
case PictOpAdd:
case PictOpOver:
switch (data->dest->format) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
store = NULL;
break;
}
break;
}
}
if (!store)
{
int bpp;
fbGetDrawable (data->dest->pDrawable, bits, stride, bpp, xoff, yoff);
}
else
{
bits = NULL;
stride = 0;