nv10: Fix build for the last nouveau_class.h changes.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Pekka Paalanen <pq@iki.fi>

diff --git a/src/gallium/drivers/nv10/nv10_context.c b/src/gallium/drivers/nv10/nv10_context.c
index 933176f..65a22b1 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_context.c
+++ b/src/gallium/drivers/nv10/nv10_context.c
@@ -243,7 +243,7 @@ static void nv10_init_hwctx(struct nv10_context *nv10)
        OUT_RING  (0.0);
        OUT_RINGf  (16777216.0);
 
-       BEGIN_RING(celsius, NV10TCL_VIEWPORT_SCALE_X, 4);
+       BEGIN_RING(celsius, NV10TCL_VIEWPORT_TRANSLATE_X, 4);
        OUT_RINGf  (-2048.0);
        OUT_RINGf  (-2048.0);
        OUT_RINGf  (16777215.0 * 0.5);

diff --git a/src/gallium/drivers/nv10/nv10_prim_vbuf.c b/src/gallium/drivers/nv10/nv10_prim_vbuf.c
index 1806d5f..7ba9777 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_prim_vbuf.c
+++ b/src/gallium/drivers/nv10/nv10_prim_vbuf.c
@@ -69,9 +69,9 @@ void nv10_vtxbuf_bind( struct nv10_context* nv10 )
 {
        int i;
        for(i = 0; i < 8; i++) {
-               BEGIN_RING(celsius, NV10TCL_VERTEX_ARRAY_ATTRIB_OFFSET(i), 1);
+               BEGIN_RING(celsius, NV10TCL_VTXBUF_ADDRESS(i), 1);
                OUT_RING(0/*nv10->vtxbuf*/);
-               BEGIN_RING(celsius, NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT(i) ,1);
+               BEGIN_RING(celsius, NV10TCL_VTXFMT(i), 1);
                OUT_RING(0/*XXX*/);
        }
 }