summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nvfx
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-19 08:45:20 -0600
committerBrian Paul <brianp@vmware.com>2010-04-19 08:45:20 -0600
commit8f3bdeaad610d7d5a5c6e73e1e9c721219595754 (patch)
tree3375ac7eb94edf1914da7faafcedea32a2bd505b /src/gallium/drivers/nvfx
parentf7c2d4fee3104008c21078879cbc5720d7bc1be6 (diff)
parente3a34cc7f6c9f959cdc2af4486e84587fab4d0d7 (diff)
Merge branch '7.8'
Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/drivers/llvmpipe/lp_context.c
Diffstat (limited to 'src/gallium/drivers/nvfx')
-rw-r--r--src/gallium/drivers/nvfx/nvfx_context.c2
-rw-r--r--src/gallium/drivers/nvfx/nvfx_state_emit.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c
index 1faa0af31f..6d2dc4d5bf 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -70,7 +70,7 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
nvfx_init_resource_functions(&nvfx->pipe);
/* Create, configure, and install fallback swtnl path */
- nvfx->draw = draw_create();
+ nvfx->draw = draw_create(&nvfx->pipe);
draw_wide_point_threshold(nvfx->draw, 9999999.0);
draw_wide_line_threshold(nvfx->draw, 9999999.0);
draw_enable_line_stipple(nvfx->draw, FALSE);
diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c
index 4137849bf0..f91ae19ecd 100644
--- a/src/gallium/drivers/nvfx/nvfx_state_emit.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c
@@ -159,7 +159,8 @@ nvfx_state_validate_swtnl(struct nvfx_context *nvfx)
draw_bind_vertex_shader(draw, nvfx->vertprog->draw);
if (nvfx->draw_dirty & NVFX_NEW_RAST)
- draw_set_rasterizer_state(draw, &nvfx->rasterizer->pipe);
+ draw_set_rasterizer_state(draw, &nvfx->rasterizer->pipe,
+ nvfx->rasterizer);
if (nvfx->draw_dirty & NVFX_NEW_UCP)
draw_set_clip_state(draw, &nvfx->clip);