diff options
| author | Pekka Paalanen <pq@iki.fi> | 2008-11-12 23:13:22 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2008-11-12 23:13:22 +0200 |
| commit | 5aaeb13a768f0c7d3706f6c170901b118ae1aa2d (patch) | |
| tree | 53b72b178245c254cfe2328e9bacba1244833c52 /src/mesa/state_tracker/st_draw.c | |
| parent | 1d6cba6572cc008760e9d4ff803b0b7e1420e41b (diff) | |
| parent | 94631e63a8d56562b782ec30a6ec5b9d77ca70a0 (diff) | |
| download | external_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.zip external_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.tar.gz external_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.tar.bz2 | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
* commit 'origin/gallium-0.1':
Mesa: fix number of buffers in st_draw_vbo().
Nouveau: fix nv20_vertex_layout()
Nouveau: update nv20 miptree according to nv40.
Nouveau: build, link and use nv20.
Nouveau: name replace for nv20.
Nouveau: Rename nv20/ files as nv20.
Nouveau: copy nv30_vertprog.c to nv20.
Nouveau: start nv20 by copying the nv10 tree.
Diffstat (limited to 'src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 7cf06da..4bc734b 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -672,7 +672,7 @@ st_draw_vbo(GLcontext *ctx, pipe_buffer_reference(pipe->screen, &vbuffer[attr].buffer, NULL); assert(!vbuffer[attr].buffer); } - pipe->set_vertex_buffers(pipe, vp->num_inputs, vbuffer); + pipe->set_vertex_buffers(pipe, num_vbuffers, vbuffer); } |