Mesa (master): nv30/40g: fix calls to draw_create(), draw_set_rasterizer_state()
Brian Paul
brianp at kemper.freedesktop.org
Tue Apr 27 14:38:05 UTC 2010
Module: Mesa
Branch: master
Commit: ea373df069aa734b4f59a5fbdbc304477a3613a0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea373df069aa734b4f59a5fbdbc304477a3613a0
Author: Pedro Maia <pedrom.maia at gmail.com>
Date: Tue Apr 27 08:21:49 2010 -0600
nv30/40g: fix calls to draw_create(), draw_set_rasterizer_state()
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/gallium/drivers/nv30/nv30_context.c | 2 +-
src/gallium/drivers/nv40/nv40_context.c | 2 +-
src/gallium/drivers/nv40/nv40_state_emit.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index 279b744..b5ce3b0 100644
--- 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
--- 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
--- 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);
More information about the mesa-commit
mailing list