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 279b74445cab824bfa2aa4d26bc6c5bb7c0e90cc..b5ce3b023867cd7724135ae87b68f914858d25c4 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 65dc73e88b32c8fa47cb27495588cc69d172762c..df0831bf0f3eba05f3e16aebac947e9ad122bd89 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 8990f303ce4e300d7465d5da6fe38571d2768270..1247c78a2e106b1c9b1e319454347a6ac59b75d9 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);