diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-19 08:35:53 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-19 08:35:53 -0600 |
| commit | e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7 (patch) | |
| tree | 437667e2b7da27f03c190bee6b67bff260af0733 /src/mesa | |
| parent | db3b34219ef1dbf9ebf5e524d3e459f9ad9571b5 (diff) | |
| download | external_mesa3d-e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7.zip external_mesa3d-e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7.tar.gz external_mesa3d-e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7.tar.bz2 | |
gallium/draw: use correct rasterization state for wide/AA points/lines
When points or lines are decomposed into triangles, we need to be sure
to disable polygon culling, stippling, "un-filled" modes, etc.
This patch sets the rasterization state to disable those things prior to
drawing points/lines with triangles, then restores the previous state
afterward.
The new piglit point-no-line-cull test checks this problem & solution.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw_feedback.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index de8beaf..684a60b 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -115,7 +115,7 @@ st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe ) _vbo_CreateContext(ctx); #if FEATURE_feedback || FEATURE_drawpix - st->draw = draw_create(); /* for selection/feedback */ + st->draw = draw_create(pipe); /* for selection/feedback */ /* Disable draw options that might convert points/lines to tris, etc. * as that would foul-up feedback/selection mode. diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 087f2f2..6bffdd8 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -134,7 +134,7 @@ st_feedback_draw_vbo(GLcontext *ctx, assert(draw); draw_set_viewport_state(draw, &st->state.viewport); draw_set_clip_state(draw, &st->state.clip); - draw_set_rasterizer_state(draw, &st->state.rasterizer); + draw_set_rasterizer_state(draw, &st->state.rasterizer, NULL); draw_bind_vertex_shader(draw, st->vp_varient->draw_shader); set_feedback_vertex_format(ctx); |