]>
Commit | Line | Data |
---|---|---|
5e8f5bd9 JB |
1 | --- XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c.orig 2003-11-24 01:54:37.000000000 +0100 |
2 | +++ XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c 2003-11-25 00:45:41.793649736 +0100 | |
3 | @@ -600,7 +600,7 @@ | |
4 | \r | |
5 | SavageClipVideo(\r | |
6 | &dstBox, &x1, &x2, &y1, &y2,\r | |
7 | - REGION_EXTENTS(pScreen, clipBoxes), width, height);\r | |
8 | + REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r | |
9 | \r | |
10 | if ((x1 >= x2) || (y1 >= y2))\r | |
11 | return Success;\r | |
12 | @@ -701,7 +701,7 @@ | |
13 | \r | |
14 | /* update cliplist */\r | |
15 | if (!RegionsEqual(&pPriv->clip, clipBoxes)) {\r | |
16 | - REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r | |
17 | + REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r | |
18 | /* draw these */\r | |
19 | xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);\r | |
20 | }\r | |
21 | @@ -2146,7 +2146,7 @@ | |
22 | \r | |
23 | #if 1\r | |
24 | SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r | |
25 | - REGION_EXTENTS(pScreen, clipBoxes), width, height);\r | |
26 | + REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r | |
27 | \r | |
28 | \r | |
29 | drw_w = dstBox.x2 - dstBox.x1;\r | |
30 | @@ -2339,7 +2339,7 @@ | |
31 | \r | |
32 | /* update cliplist */\r | |
33 | if(!RegionsEqual(&pPriv->clip, clipBoxes)) {\r | |
34 | - REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r | |
35 | + REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r | |
36 | /* draw these */\r | |
37 | XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0,\r | |
38 | REGION_NUM_RECTS(clipBoxes),\r | |
39 | @@ -2724,7 +2724,7 @@ | |
40 | dstBox.y2 = drw_y + drw_h;\r | |
41 | \r | |
42 | SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r | |
43 | - REGION_EXTENTS(pScreen, clipBoxes), \r | |
44 | + REGION_EXTENTS(pScrn->pScreen, clipBoxes), \r | |
45 | surface->width, surface->height);\r | |
46 | \r | |
47 | if((x1 >= x2) || (y1 >= y2))\r |