diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-10 11:19:30 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-10 11:19:30 -0700 |
| commit | 2b66417402bc595be301ab9ed7b9ea2a5f79e180 (patch) | |
| tree | 32ec9363dc065d41a1efc72e57ebb44cf333f598 /src/mesa/state_tracker | |
| parent | 399da3a337932c6074a69ac73e711138271308eb (diff) | |
| parent | eb4dded5be60af4c7d45394aaa0aca24549ec3d8 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/util/u_math.c
Diffstat (limited to 'src/mesa/state_tracker')
| -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 7cf06da43c..4bc734bad3 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); } |