Fix kaa to not try Copy for pixmap sources
This commit is contained in:
parent
a2bd75d15a
commit
14ed0c3d6d
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $XFree86$
|
||||
* $XFree86: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.1 2001/05/29 04:54:10 keithp Exp $
|
||||
*
|
||||
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
|
||||
*
|
||||
|
@ -127,7 +127,8 @@ kaaCopyNtoN (DrawablePtr pSrcDrawable,
|
|||
CARD32 cmd;
|
||||
CARD8 alu;
|
||||
|
||||
if ((*pKaaScr->PrepareCopy) (pSrcDrawable,
|
||||
if (pSrcDrawable->type == DRAWABLE_WINDOW &&
|
||||
(*pKaaScr->PrepareCopy) (pSrcDrawable,
|
||||
pDstDrawable,
|
||||
upsidedown,
|
||||
reverse,
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.6 2000/10/11 06:04:40 keithp Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.8 2001/05/29 04:54:12 keithp Exp $ */
|
||||
|
||||
#include "trident.h"
|
||||
#include "tridentdraw.h"
|
||||
|
@ -119,9 +119,7 @@ tridentPrepareCopy (DrawablePtr pSrcDrawable,
|
|||
{
|
||||
FbBits depthMask;
|
||||
|
||||
if ((pm & depthMask) == depthMask &&
|
||||
pSrcDrawable->type == DRAWABLE_WINDOW &&
|
||||
pDstDrawable->type == DRAWABLE_WINDOW)
|
||||
if ((pm & depthMask) == depthMask)
|
||||
{
|
||||
KdScreenPriv(pDstDrawable->pScreen);
|
||||
tridentCardInfo(pScreenPriv);
|
||||
|
|
Loading…
Reference in New Issue
Block a user