diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-03-18 14:32:54 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-03-18 15:06:58 +0100 |
| commit | e2146d3b29a4bea3d584c145e3190c3313692ed9 (patch) | |
| tree | 5284d5b315fcda784759018b974f46f52b5d2f55 | |
| parent | 7858345b6b384e88902ccc516715156401edec04 (diff) | |
| download | xorg-driver-xf86-video-nouveau-e2146d3b29a4bea3d584c145e3190c3313692ed9.tar.gz | |
Fix for the latest nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| -rw-r--r-- | src/nv10_exa.c | 2 | ||||
| -rw-r--r-- | src/nv30_xv_tex.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nv10_exa.c b/src/nv10_exa.c index 48c4175..1acb583 100644 --- a/src/nv10_exa.c +++ b/src/nv10_exa.c @@ -900,7 +900,7 @@ NVAccelInitNV10TCL(ScrnInfoPtr pScrn) OUT_RING (chan, 0); BEGIN_RING(chan, celsius, NV10TCL_CULL_FACE_ENABLE, 1); OUT_RING (chan, 0); - BEGIN_RING(chan, celsius, NV10TCL_TX_GEN_S(0), 8); + BEGIN_RING(chan, celsius, NV10TCL_TX_GEN_MODE_S(0), 8); for (i = 0; i < 8; i++) OUT_RING (chan, 0); diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c index 7e79267..617e63b 100644 --- a/src/nv30_xv_tex.c +++ b/src/nv30_xv_tex.c @@ -143,11 +143,11 @@ NV30VideoTexture(ScrnInfoPtr pScrn, struct nouveau_bo *src, int offset, card_swz = SWIZZLE(S1, S1, S1, S1, X, Y, Z, W); break; case 1: - card_fmt = NV34TCL_TX_FORMAT_FORMAT_A8_RECT2; + card_fmt = NV34TCL_TX_FORMAT_FORMAT_A8_RECT; card_swz = SWIZZLE(S1, S1, S1, S1, X, X, X, X); break; case 2: - card_fmt = NV34TCL_TX_FORMAT_FORMAT_L8A8_RECT; + card_fmt = NV34TCL_TX_FORMAT_FORMAT_A8L8_RECT; #if X_BYTE_ORDER == X_BIG_ENDIAN card_swz = SWIZZLE(S1, S1, S1, S1, Z, W, X, Y); /* x = V, y = U */ #else |