diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-21 11:17:55 +0100 |
---|---|---|
committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:03 -0400 |
commit | f9eafeca297497a94c438ea28ed59f3a45ed2566 (patch) | |
tree | 135ad0fbb6f9bd900f3cb9b411024e669d1f87e2 /src/gallium/drivers/nv40/nv40_vbo.c | |
parent | bcb37411fc9159a5c1af50b7defbf1f526b50793 (diff) |
nv30, nv40: non-trivially unify nv[34]0_draw.c
nv30_draw.c is a stub.
This patch makes both nv30 and nv40 use the nv40 swtnl path.
Note that this doesn't actually work on nv30 because the vertex program is
encoded in the nv40-only layout.
However, swtnl was unimplemented before on nv30, so this is not a regression.
Furthermore, a patch to fix this is available near the end of the patchset.
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_vbo.c')
-rw-r--r-- | src/gallium/drivers/nv40/nv40_vbo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c index 456b508d43..196a12b1f6 100644 --- a/src/gallium/drivers/nv40/nv40_vbo.c +++ b/src/gallium/drivers/nv40/nv40_vbo.c @@ -177,7 +177,7 @@ nv40_draw_arrays(struct pipe_context *pipe, nv40_vbo_set_idxbuf(nvfx, NULL, 0); if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) { - nv40_draw_elements_swtnl(pipe, NULL, 0, + nvfx_draw_elements_swtnl(pipe, NULL, 0, mode, start, count); return; } @@ -467,7 +467,7 @@ nv40_draw_elements(struct pipe_context *pipe, idxbuf = nv40_vbo_set_idxbuf(nvfx, indexBuffer, indexSize); if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) { - nv40_draw_elements_swtnl(pipe, NULL, 0, + nvfx_draw_elements_swtnl(pipe, NULL, 0, mode, start, count); return; } |