nv20: send buffer handles on hw state emit

Color and Z buffer offsets were emitted here, now also the buffer
handles are emitted so they target the correct memory.

Signed-off-by: Pekka Paalanen <pq@iki.fi>

diff --git a/src/gallium/drivers/nv20/nv20_state_emit.c b/src/gallium/drivers/nv20/nv20_state_emit.c
index 5d5f4cdc082bb011b1fb6bddf5de46dfba380fe8..ea20078a50a79ca67b26c74ac459689ed822b32c 100644 (file)
--- a/src/gallium/drivers/nv20/nv20_state_emit.c
+++ b/src/gallium/drivers/nv20/nv20_state_emit.c
@@ -355,16 +355,14 @@ nv20_emit_hw_state(struct nv20_context *nv20)
         */
 
        /* Render target */
-/* XXX figre out who's who for NV10TCL_DMA_* and fill accordingly
- *     BEGIN_RING(kelvin, NV20TCL_DMA_COLOR0, 1);
- *     OUT_RELOCo(nv20->rt[0], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR); */
+       BEGIN_RING(kelvin, NV20TCL_DMA_COLOR, 1);
+       OUT_RELOCo(nv20->rt[0], NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
        BEGIN_RING(kelvin, NV20TCL_COLOR_OFFSET, 1);
        OUT_RELOCl(nv20->rt[0], 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
 
        if (nv20->zeta) {
-/* XXX
- *             BEGIN_RING(kelvin, NV20TCL_DMA_ZETA, 1);
- *             OUT_RELOCo(nv20->zeta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR); */
+               BEGIN_RING(kelvin, NV20TCL_DMA_ZETA, 1);
+               OUT_RELOCo(nv20->zeta, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
                BEGIN_RING(kelvin, NV20TCL_ZETA_OFFSET, 1);
                OUT_RELOCl(nv20->zeta, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
                /* XXX for when we allocate LMA on nv17 */