This commit was manufactured by cvs2git to create branch 'AC-branch'.

[packages/XFree86.git] / XFree86-new-s3-pScreen.patch

diff --git a/XFree86-new-s3-pScreen.patch b/XFree86-new-s3-pScreen.patch
deleted file mode 100644 (file)
index eb21255..0000000
--- a/XFree86-new-s3-pScreen.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c.orig       2003-11-24 01:54:37.000000000 +0100
-+++ XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c    2003-11-25 00:45:41.793649736 +0100
-@@ -600,7 +600,7 @@
- \r
-     SavageClipVideo(\r
-         &dstBox, &x1, &x2, &y1, &y2,\r
--        REGION_EXTENTS(pScreen, clipBoxes), width, height);\r
-+        REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r
- \r
-     if ((x1 >= x2) || (y1 >= y2))\r
-         return Success;\r
-@@ -701,7 +701,7 @@
- \r
-     /* update cliplist */\r
-     if (!RegionsEqual(&pPriv->clip, clipBoxes)) {\r
--        REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r
-+        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r
-         /* draw these */\r
-         xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);\r
-     }\r
-@@ -2146,7 +2146,7 @@
- \r
- #if 1\r
-         SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r
--                        REGION_EXTENTS(pScreen, clipBoxes), width, height);\r
-+                        REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r
- \r
- \r
-         drw_w = dstBox.x2 - dstBox.x1;\r
-@@ -2339,7 +2339,7 @@
- \r
-             /* update cliplist */\r
-             if(!RegionsEqual(&pPriv->clip, clipBoxes)) {\r
--                REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r
-+                REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r
-                 /* draw these */\r
-                 XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0,\r
-                                   REGION_NUM_RECTS(clipBoxes),\r
-@@ -2724,7 +2724,7 @@
-     dstBox.y2 = drw_y + drw_h;\r
- \r
-     SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r
--                      REGION_EXTENTS(pScreen, clipBoxes), \r
-+                      REGION_EXTENTS(pScrn->pScreen, clipBoxes), \r
-                     surface->width, surface->height);\r
- \r
-     if((x1 >= x2) || (y1 >= y2))\r