Mesa (gallium-0.2): nv20: send buffer handles on hw state emit

[Pekka Paalanen]

Module: Mesa
Branch: gallium-0.2
Commit: 7062b7c7cb32c3c96bb87b296d9df0ecae7e7c83
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7062b7c7cb32c3c96bb87b296d9df0ecae7e7c83

Author: Pekka Paalanen <pq at iki.fi>
Date:   Sat Jan 31 23:32:32 2009 +0200

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 at iki.fi>

---

 src/gallium/drivers/nv20/nv20_state_emit.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nv20/nv20_state_emit.c b/src/gallium/drivers/nv20/nv20_state_emit.c
index 5d5f4cd..ea20078 100644
--- 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 */