nv30: Rename state emission func

[mesa.git] / src / gallium / drivers / nv30 / nv30_vbo.c

diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index ff0ce6ac810d7bfda05299ff85391c6034127725..0f82adfee0480e10d0f185af90e9a7933d060d52 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -55,7 +55,7 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
        {
                float *v = map;
 
-               BEGIN_RING(rankine, NV34TCL_VERTEX_ATTR_4F_X(attrib), 4);
+               BEGIN_RING(rankine, NV34TCL_VTX_ATTR_4F_X(attrib), 4);
                switch (ncomp) {
                case 4:
                        OUT_RINGf(v[0]);
@@ -100,7 +100,7 @@ nv30_vbo_static_attrib(struct nv30_context *nv30, int attrib,
 static void
 nv30_vbo_arrays_update(struct nv30_context *nv30)
 {
-       struct nv30_vertex_program *vp = nv30->vertprog.active;
+       struct nv30_vertex_program *vp = nv30->vertprog;
        uint32_t inputs, vtxfmt[16];
        int hw, num_hw = 0;
 
@@ -154,7 +154,9 @@ nv30_vbo_validate_state(struct nv30_context *nv30,
 {
        unsigned inputs;
 
-       nv30_emit_hw_state(nv30);
+       nv30_state_validate(nv30);
+
+       nv30_state_emit(nv30);
 
        if (nv30->dirty & NV30_NEW_ARRAYS) {
                nv30_vbo_arrays_update(nv30);