XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

G80: Fix some ROP bugs.

Browse Source
This commit is contained in:
Aaron Plattner
2008-08-03 19:29:34 -07:00
parent 9b727b8384
commit 2e0416cf89
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/g80_exa.c
View File

@@ -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;

12
src/g80_xaa.c
View File

@@ -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);