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_vbo.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_vbo.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_vbo.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c index b2753b8e2e..af3fcf6a34 100644 --- a/src/gallium/drivers/nv40/nv40_vbo.c +++ b/src/gallium/drivers/nv40/nv40_vbo.c @@ -484,11 +484,6 @@ nv40_vbo_validate(struct nv40_context *nv40) unsigned vb_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD; int hw; - if (nv40->edgeflags) { - nv40->fallback_swtnl |= NV40_NEW_ARRAYS; - return FALSE; - } - vtxbuf = so_new(20, 18); so_method(vtxbuf, curie, NV40TCL_VTXBUF_ADDRESS(0), nv40->vtxelt_nr); vtxfmt = so_new(17, 0); |