diff options
| author | Thomas Hellström <thomas@shipmail.org> | 2009-02-06 10:52:50 +0000 |
|---|---|---|
| committer | Thomas Hellström <thomas@shipmail.org> | 2009-02-06 10:52:50 +0000 |
| commit | 74b6f685dc18bae7316b3859bd8eb944e96257d9 (patch) | |
| tree | 495541840551277caa84f2a1a4abf297713d41ff | |
| parent | 903621ed38f0355556294b6125ad0976a65387c8 (diff) | |
Tweak EXA to give us the pixmap address when doing
uploadToScratch.
Disable a1 and a4 formats for now, until we know how the pitch
should be handled.
| -rw-r--r-- | src/via_3d.c | 6 | ||||
| -rw-r--r-- | src/via_accel.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/via_3d.c b/src/via_3d.c index f83b85b..4697b8a 100644 --- a/src/via_3d.c +++ b/src/via_3d.c @@ -48,7 +48,7 @@ static ViaCompositeOperator viaOperatorModes[256]; static Via3DFormat via3DFormats[256]; #define VIA_NUM_3D_OPCODES 19 -#define VIA_NUM_3D_FORMATS 15 +#define VIA_NUM_3D_FORMATS 13 #define VIA_FMT_HASH(arg) (((((arg) >> 1) + (arg)) >> 8) & 0xFF) /* @@ -102,8 +102,8 @@ static const CARD32 viaFormats[VIA_NUM_3D_FORMATS][5] = { {PICT_x8b8g8r8, HC_HDBFM_ABGR0888, HC_HTXnFM_ABGR0888, 1, 1}, {PICT_a8b8g8r8, HC_HDBFM_ABGR8888, HC_HTXnFM_ABGR8888, 1, 1}, {PICT_a8, 0x00, HC_HTXnFM_A8, 0, 1}, - {PICT_a4, 0x00, HC_HTXnFM_A4, 0, 1}, - {PICT_a1, 0x00, HC_HTXnFM_A1, 0, 1} + // {PICT_a4, 0x00, HC_HTXnFM_A4, 0, 1}, + // {PICT_a1, 0x00, HC_HTXnFM_A1, 0, 1} }; /* diff --git a/src/via_accel.c b/src/via_accel.c index 81426f1..d27dbc0 100644 --- a/src/via_accel.c +++ b/src/via_accel.c @@ -933,7 +933,9 @@ viaExaUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) pDst->devKind = dstPitch; pDst->devPrivate.ptr = dst; - src = pSrc->devPrivate.ptr; + src = (void *) exaGetPixmapOffset(pSrc) + + (unsigned long) pVia->exaMem.virtual; + srcPitch = exaGetPixmapPitch(pSrc); while (h--) { |