Module Name: xsrc
Committed By: macallan
Date: Tue Oct 6 06:25:47 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime_accel.c
Log Message:
use PIXMAP_IS_SCREEN()
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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.11 xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.12
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.11 Tue Sep 29 20:41:22 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c Tue Oct 6 06:25:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_accel.c,v 1.11 2009/09/29 20:41:22 macallan Exp $ */
+/* $NetBSD: crime_accel.c,v 1.12 2009/10/06 06:25:47 macallan 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,
