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/drivers/nv40/nv40_state_emit.c | |
| parent | 00b463fc30b30911797c5d5eaaeae79b7a36589b (diff) | |
| parent | 420ff89067515a74c9625a103cadc267d5f64bd4 (diff) | |
Merge branch 'gallium-edgeflags'
Conflicts:
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_state_emit.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_state_emit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c index ba0fbcb26a..789ed16126 100644 --- a/src/gallium/drivers/nv40/nv40_state_emit.c +++ b/src/gallium/drivers/nv40/nv40_state_emit.c @@ -168,7 +168,6 @@ nv40_state_validate_swtnl(struct nv40_context *nv40) draw_set_viewport_state(draw, &nv40->viewport); if (nv40->draw_dirty & NV40_NEW_ARRAYS) { - draw_set_edgeflags(draw, nv40->edgeflags); draw_set_vertex_buffers(draw, nv40->vtxbuf_nr, nv40->vtxbuf); draw_set_vertex_elements(draw, nv40->vtxelt_nr, nv40->vtxelt); } |