nv30/40g: fix calls to draw_create(), draw_set_rasterizer_state()

Signed-off-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index 279b744..b5ce3b0 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_context.c
@@ -76,7 +76,7 @@ nv30_create(struct pipe_screen *pscreen, void *priv)
        nv30_init_state_functions(nv30);
 
        /* Create, configure, and install fallback swtnl path */
-       nv30->draw = draw_create();
+       nv30->draw = draw_create(&nv30->pipe);
        draw_wide_point_threshold(nv30->draw, 9999999.0);
        draw_wide_line_threshold(nv30->draw, 9999999.0);
        draw_enable_line_stipple(nv30->draw, FALSE);

diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index 65dc73e..df0831b 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -76,7 +76,7 @@ nv40_create(struct pipe_screen *pscreen, void *priv)
        nv40_init_state_functions(nv40);
 
        /* Create, configure, and install fallback swtnl path */
-       nv40->draw = draw_create();
+       nv40->draw = draw_create(&nv40->pipe);
        draw_wide_point_threshold(nv40->draw, 9999999.0);
        draw_wide_line_threshold(nv40->draw, 9999999.0);
        draw_enable_line_stipple(nv40->draw, FALSE);

diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index 8990f30..1247c78 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -164,7 +164,7 @@ nv40_state_validate_swtnl(struct nv40_context *nv40)
                draw_bind_vertex_shader(draw, nv40->vertprog->draw);
 
        if (nv40->draw_dirty & NV40_NEW_RAST)
-               draw_set_rasterizer_state(draw, &nv40->rasterizer->pipe);
+               draw_set_rasterizer_state(draw, &nv40->rasterizer->pipe, nv40->rasterizer);
 
        if (nv40->draw_dirty & NV40_NEW_UCP)
                draw_set_clip_state(draw, &nv40->clip);