diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2008-08-03 19:29:34 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2008-08-04 15:09:19 -0700 |
| commit | 2e0416cf8970ab4e3065a0109129b2121982c031 (patch) | |
| tree | 07e00707bce1e32dac7bc61ee338a05b8532e419 | |
| parent | 9b727b8384d51e3657bb50efa090adde91c17a73 (diff) | |
G80: Fix some ROP bugs.
| -rw-r--r-- | src/g80_exa.c | 4 | ||||
| -rw-r--r-- | src/g80_xaa.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/g80_exa.c b/src/g80_exa.c index 96dbc21..a327c51 100644 --- a/src/g80_exa.c +++ b/src/g80_exa.c @@ -109,7 +109,7 @@ prepareSolid(PixmapPtr pPixmap, if(pPixmap->drawable.depth > 24) return FALSE; if(!setDst(pNv, pPixmap)) return FALSE; G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, alu, planemask); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 4); @@ -160,7 +160,7 @@ prepareCopy(PixmapPtr pSrcPixmap, if(alu == GXcopy && planemask == ~0) { G80DmaNext (pNv, 3); } else { - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, alu, planemask); } pNv->DMAKickoffCallback = G80DMAKickoffCallback; diff --git a/src/g80_xaa.c b/src/g80_xaa.c index 0859623..bcacbb4 100644 --- a/src/g80_xaa.c +++ b/src/g80_xaa.c @@ -125,7 +125,7 @@ G80SetupForScreenToScreenCopy( if(rop == GXcopy && planemask == ~0) { G80DmaNext (pNv, 3); } else { - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); } pNv->DMAKickoffCallback = G80DMAKickoffCallback; @@ -177,7 +177,7 @@ G80SetupForSolidFill( G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 4); @@ -235,7 +235,7 @@ G80SetupForMono8x8PatternFill( G80SetPattern(pNv, bg, fg, patternx, patterny); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 4); G80DmaStart(pNv, 0x588, 1); @@ -275,7 +275,7 @@ G80SetupForScanlineCPUToScreenColorExpandFill( planemask |= mask; G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); G80DmaStart(pNv, 0x800, 1); G80DmaNext (pNv, 1); @@ -353,7 +353,7 @@ G80SetupForScanlineImageWrite( if(rop == GXcopy && planemask == ~0) { G80DmaNext (pNv, 3); } else { - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); } @@ -420,7 +420,7 @@ G80SetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop, unsigned planemask) G80SetClip(pNv, 0, 0, 0x7fff, 0x7fff); G80DmaStart(pNv, 0x2ac, 1); - G80DmaNext (pNv, 1); + G80DmaNext (pNv, 4); G80SetRopSolid(pNv, rop, planemask); G80DmaStart(pNv, 0x580, 1); G80DmaNext (pNv, 1); |