SOURCES: xorg-driver-video-intel-compiz_fix.patch (NEW) Now can wa...

[luzik]

Author: luzik                        Date: Tue Oct 23 06:10:51 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
Now can watch movies using xv under compiz env

---- Files affected:
SOURCES:
   xorg-driver-video-intel-compiz_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/xorg-driver-video-intel-compiz_fix.patch
diff -u /dev/null SOURCES/xorg-driver-video-intel-compiz_fix.patch:1.1
--- /dev/null	Tue Oct 23 08:10:51 2007
+++ SOURCES/xorg-driver-video-intel-compiz_fix.patch	Tue Oct 23 08:10:46 2007
@@ -0,0 +1,33 @@
+--- xserver-xorg-video-intel-2.1.1.orig/src/i830_video.c
++++ xserver-xorg-video-intel-2.1.1/src/i830_video.c
+@@ -569,8 +569,12 @@
+     /* Set up textured video if we can do it at this depth and we are on
+      * supported hardware.
+      */
++#if 0
+     if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
+ 	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
++#endif
++    if (pScrn->bitsPerPixel >= 16 && IS_I965G(pI830) &&
++	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
+     {
+ 	texturedAdaptor = I830SetupImageVideoTextured(pScreen);
+ 	if (texturedAdaptor != NULL) {
+@@ -2486,7 +2490,8 @@
+     }
+ #endif
+ 
+-    if (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
++    if (pPriv->textured &&
++	((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
+ 	((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
+ 	 pI830->FbMapSize)) {
+ 	/* If the pixmap wasn't in framebuffer, then we have no way in XAA to
+@@ -2504,6 +2509,7 @@
+ 	if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
+ 	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
+ 	    i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
++	    xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
+ 	}
+     } else if (IS_I965G(pI830)) {
+ 	I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,
================================================================