diff options
author | Roland Scheidegger <sroland@vmware.com> | 2009-12-22 20:54:26 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2009-12-22 20:54:26 +0100 |
commit | 35e8283c69d80debb44b05ea79dc5f67303a7432 (patch) | |
tree | aacfe7f201094793c3d29ec0ddcc71cb01f7476c /src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c | |
parent | 00b463fc30b30911797c5d5eaaeae79b7a36589b (diff) | |
parent | 420ff89067515a74c9625a103cadc267d5f64bd4 (diff) |
Merge branch 'gallium-edgeflags'
Conflicts:
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c')
-rw-r--r-- | src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c index df6c265b7e..932113783d 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c @@ -85,9 +85,9 @@ static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle, draw_pt_post_vs_prepare( fpme->post_vs, (boolean)draw->bypass_clipping, (boolean)(draw->identity_viewport || - draw->rasterizer->bypass_vs_clip_and_viewport), - (boolean)draw->rasterizer->gl_rasterization_rules ); - + draw->rasterizer->bypass_vs_clip_and_viewport), + (boolean)draw->rasterizer->gl_rasterization_rules, + (draw->vs.edgeflag_output ? true : false) ); if (!(opt & PT_PIPELINE)) { draw_pt_emit_prepare( fpme->emit, |