frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Correctly set the texture coordinate set source for the second texture 

unit.
- Re-enable Radeon's Composite accel now that fonts work again.
This commit is contained in:
Eric Anholt 2004-01-04 20:47:30 +00:00
parent 9f1a92cd09
commit 34d1529731
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/kdrive/ati/ati_draw.c
View File

@ -475,13 +475,12 @@ ATIDrawInit(ScreenPtr pScreen)
atis->kaa.Blend = R128BlendDMA;
atis->kaa.DoneBlend = R128DoneBlendDMA;
} else if (!atic->is_r200) {
/* XXX: This code is broken so far. */
/*atis->kaa.PrepareBlend = RadeonPrepareBlend;
atis->kaa.PrepareBlend = RadeonPrepareBlend;
atis->kaa.Blend = RadeonBlend;
atis->kaa.DoneBlend = RadeonDoneBlend;
atis->kaa.PrepareComposite = RadeonPrepareComposite;
atis->kaa.Composite = RadeonComposite;
atis->kaa.DoneComposite = RadeonDoneComposite;*/
atis->kaa.DoneComposite = RadeonDoneComposite;
}
} else {
#else

1
hw/kdrive/ati/radeon_composite.c
View File

@ -133,6 +133,7 @@ RadeonTextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit)
txformat |= (ATILog2(h) - 1) << RADEON_TXFORMAT_HEIGHT_SHIFT;
} else
txformat |= RADEON_TXFORMAT_NON_POWER2;
txformat |= unit << 24; /* RADEON_TXFORMAT_ST_ROUTE_STQX */
txpitch = pPix->devKind;
txoffset = ((CARD8 *)pPix->devPrivate.ptr -