nv50: update nv50_texture.h
PATCH 4/5 nv50: update nv50_texture.h
- copy changes from mesa/src/gallium/drivers/nv50/nv50_texture.h
- remove 2 redefinitions
- fix R<->B rename (see df189c9efc0fbcdce816af483f0147ab635280d1 (nv50: TIC/TSC fixes and additions) in mesa repo)
--- src/nv50_exa.c | 45 ++++++++++++-------------- src/nv50_texture.h | 89 ++++++++++++++++++++++++++++++++++++++-------------- src/nv50_xv.c | 16 +++++----- 3 files changed, 94 insertions(+), 56 deletions(-)
src/nv50_exa.c +21 -24
@@ -572,9 +572,6 @@ NV50EXACheckTexture(PicturePtr ppict, PicturePtr pdpict, int op)return TRUE; } -#define NV50TIC_0_0_FMT_1_5_5_5 0x00000014 -#define NV50TIC_0_0_FMT_4_4_4_4 0x00000012 -#define _ (X1 ,X2 ,X3 ,X4 ,FMT ) (NV50TIC_0_0_TYPER_UNORM | NV50TIC_0_0_TYPEG_UNORM | NV50TIC_0_0_TYPEB_UNORM | NV50TIC_0_0_TYPEA_UNORM | \ NV50TIC_0_0_MAP##X1 | NV50TIC_0_0_MAP##X2 | NV50TIC_0_0_MAP##X3 | NV50TIC_0_0_MAP##X4 | \ NV50TIC_0_0_FMT_##FMT)
@@ -607,67 +604,67 @@ NV50EXATexture(PixmapPtr ppix, PicturePtr ppict, unsigned unit)switch (ppict->format) {case PICT_a8r8g8b8: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 8_8_8_8)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 8_8_8_8));break ;case PICT_a8b8g8r8: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 8_8_8_8)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 8_8_8_8));break ;case PICT_x8r8g8b8: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 8_8_8_8)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 8_8_8_8));break ;case PICT_x8b8g8r8: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 8_8_8_8)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 8_8_8_8));break ;case PICT_r5g6b5: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 5_6_5)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 5_6_5));break ;case PICT_a8: -OUT_RING (chan,_ (A_C0 ,R_ZERO ,G_ZERO ,B_ZERO ,8 )); +OUT_RING (chan,_ (A_C0 ,B_ZERO ,G_ZERO ,R_ZERO ,8 ));break ;case PICT_x1r5g5b5: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 1_5_5_5)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 1_5_5_5));break ;case PICT_x1b5g5r5: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 1_5_5_5)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 1_5_5_5));break ;case PICT_a1r5g5b5: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 1_5_5_5)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 1_5_5_5));break ;case PICT_a1b5g5r5: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 1_5_5_5)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 1_5_5_5));break ;case PICT_b5g6r5: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 5_6_5)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 5_6_5));break ;case PICT_b8g8r8x8: - OUT_RING(chan, _(A_ONE, B_C1, G_C2, R_C3, 8_8_8_8)); + OUT_RING(chan, _(A_ONE, R_C1, G_C2, B_C3, 8_8_8_8));break ;case PICT_b8g8r8a8: - OUT_RING(chan, _(A_C0, B_C1, G_C2, R_C3, 8_8_8_8)); + OUT_RING(chan, _(A_C0, R_C1, G_C2, B_C3, 8_8_8_8));break ;case PICT_a2b10g10r10: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 2_10_10_10)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 2_10_10_10));break ;case PICT_x2b10g10r10: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 2_10_10_10)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 2_10_10_10));break ;case PICT_x2r10g10b10: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 2_10_10_10)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 2_10_10_10));break ;case PICT_a2r10g10b10: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 2_10_10_10)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 2_10_10_10));break ;case PICT_x4r4g4b4: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 4_4_4_4)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 4_4_4_4));break ;case PICT_x4b4g4r4: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_ONE, 4_4_4_4)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_ONE, 4_4_4_4));break ;case PICT_a4r4g4b4: - OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 4_4_4_4)); + OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 4_4_4_4));break ;case PICT_a4b4g4r4: - OUT_RING(chan, _(B_C0, G_C1, R_C2, A_C3, 4_4_4_4)); + OUT_RING(chan, _(R_C0, G_C1, B_C2, A_C3, 4_4_4_4));break ;default :NOUVEAU_FALLBACK ("invalid picture format, this SHOULD NOT HAPPEN. Expect trouble.\n" );
src/nv50_texture.h +65 -24
128 lines not on this page · raw message
src/nv50_xv.c +8 -8
@@ -113,9 +113,9 @@ nv50_xv_state_emit(PixmapPtr ppix, int id, struct nouveau_bo *src,BEGIN_RING (chan, tesla,NV50TCL_CB_DATA (0 ) |0x40000000 ,16 );if (id ==FOURCC_YV12 || id ==FOURCC_I420 ) {OUT_RING (chan,NV50TIC_0_0_MAPA_C0 |NV50TIC_0_0_TYPEA_UNORM | -NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM | -NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM |NV50TIC_0_0_MAPB_ZERO |NV50TIC_0_0_TYPEB_UNORM | +NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM | +NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM |NV50TIC_0_0_FMT_8 );if (OUT_RELOCl (chan, src, packed_y,NOUVEAU_BO_VRAM |NOUVEAU_BO_RD )) {MARK_UNDO (chan);
@@ -131,9 +131,9 @@ nv50_xv_state_emit(PixmapPtr ppix, int id, struct nouveau_bo *src,return FALSE; }OUT_RING (chan,NV50TIC_0_0_MAPA_C1 |NV50TIC_0_0_TYPEA_UNORM | -NV50TIC_0_0_MAPR_C0 |NV50TIC_0_0_TYPER_UNORM | +NV50TIC_0_0_MAPB_C0 |NV50TIC_0_0_TYPEB_UNORM |NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM | -NV50TIC_0_0_MAPB_ZERO |NV50TIC_0_0_TYPEB_UNORM | +NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM |NV50TIC_0_0_FMT_8_8 );if (OUT_RELOCl (chan, src, uv,NOUVEAU_BO_VRAM |NOUVEAU_BO_RD )) {MARK_UNDO (chan);
@@ -150,9 +150,9 @@ nv50_xv_state_emit(PixmapPtr ppix, int id, struct nouveau_bo *src, } }else {OUT_RING (chan,NV50TIC_0_0_MAPA_C0 |NV50TIC_0_0_TYPEA_UNORM | -NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM | -NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM |NV50TIC_0_0_MAPB_ZERO |NV50TIC_0_0_TYPEB_UNORM | +NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM | +NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM |NV50TIC_0_0_FMT_8_8 );if (OUT_RELOCl (chan, src, packed_y,NOUVEAU_BO_VRAM |NOUVEAU_BO_RD )) {MARK_UNDO (chan);
@@ -168,9 +168,9 @@ nv50_xv_state_emit(PixmapPtr ppix, int id, struct nouveau_bo *src,return FALSE; }OUT_RING (chan,NV50TIC_0_0_MAPA_C3 |NV50TIC_0_0_TYPEA_UNORM | -NV50TIC_0_0_MAPR_C1 |NV50TIC_0_0_TYPER_UNORM | +NV50TIC_0_0_MAPB_C1 |NV50TIC_0_0_TYPEB_UNORM |NV50TIC_0_0_MAPG_ZERO |NV50TIC_0_0_TYPEG_UNORM | -NV50TIC_0_0_MAPB_ZERO |NV50TIC_0_0_TYPEB_UNORM | +NV50TIC_0_0_MAPR_ZERO |NV50TIC_0_0_TYPER_UNORM |NV50TIC_0_0_FMT_8_8_8_8 );if (OUT_RELOCl (chan, src, packed_y,NOUVEAU_BO_VRAM |NOUVEAU_BO_RD )) {MARK_UNDO (chan);
Signature · 1 line
1.6.6.rc3