Module Name: xsrc
Committed By: snj
Date: Fri Oct 16 06:53:28 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src [netbsd-5]: crime_accel.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #1092):
external/mit/xf86-video-crime/dist/src/crime_accel.c: revision 1.12
use PIXMAP_IS_SCREEN()
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.10 -r1.3.2.11 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.3.2.10 xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.3.2.11
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.3.2.10 Fri Oct 16 06:20:23 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c Fri Oct 16 06:53:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_accel.c,v 1.3.2.10 2009/10/16 06:20:23 snj Exp $ */
+/* $NetBSD: crime_accel.c,v 1.3.2.11 2009/10/16 06:53:28 snj Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -1704,9 +1704,11 @@
return FALSE;
if((pDst->pDrawable->type == DRAWABLE_WINDOW) ||
- IS_OFFSCREEN_PIXMAP(pDst->pDrawable)) {
+ IS_OFFSCREEN_PIXMAP(pDst->pDrawable) ||
+ PIXMAP_IS_SCREEN(pDst->pDrawable)) {
if ((pSrc->pDrawable->type == DRAWABLE_WINDOW) ||
- IS_OFFSCREEN_PIXMAP(pSrc->pDrawable)) {
+ IS_OFFSCREEN_PIXMAP(pSrc->pDrawable) ||
+ PIXMAP_IS_SCREEN(pSrc->pDrawable)) {
/* screen-to-screen */
CrimeDoScreenToScreenComposite(op, pSrc, pMask, pDst,
xSrc, ySrc, xMask, yMask,
