diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-01-04 20:47:30 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-01-04 20:47:30 +0000 |
| commit | 34d1529731fff0cb61c71f76edc5c6499ece68d1 (patch) | |
| tree | fb70a927f91838a18185719f26f5ecd13e5a0fa1 /hw | |
| parent | 9f1a92cd092e87f774ce4ed99d4b3e15f905d4f7 (diff) | |
- Correctly set the texture coordinate set source for the second texture
unit.
- Re-enable Radeon's Composite accel now that fonts work again.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/ati/ati_draw.c | 5 | ||||
| -rw-r--r-- | hw/kdrive/ati/radeon_composite.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index bf7000b7c..1e2879443 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -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 diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c index d6ac82f6a..f431b428a 100644 --- a/hw/kdrive/ati/radeon_composite.c +++ b/hw/kdrive/ati/radeon_composite.c @@ -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 - |