diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
commit | 3119e9a14b66fcfb08fcc3563602273dd2e1893c (patch) | |
tree | 74ff685faec3430b66d70522b6ed717f57e54f00 /src/mesa/pipe/draw/draw_vbuf.h | |
parent | 9de335f5807553bc9251931ba3e80c4b454b5818 (diff) | |
parent | 587e2becc237bc1c900a1c0ba114a1a0192690ff (diff) |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/draw/draw_vbuf.h')
-rw-r--r-- | src/mesa/pipe/draw/draw_vbuf.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/pipe/draw/draw_vbuf.h b/src/mesa/pipe/draw/draw_vbuf.h index 43aa740f64..be4c4ab77b 100644 --- a/src/mesa/pipe/draw/draw_vbuf.h +++ b/src/mesa/pipe/draw/draw_vbuf.h @@ -82,8 +82,12 @@ struct vbuf_render { * DrawElements, note indices are ushort: */ void (*draw)( struct vbuf_render *, + uint prim, const ushort *indices, - unsigned nr_indices ); + uint nr_indices, + const void *vertices, + uint nr_vertices, + uint vertex_bytes); /** * Called when vbuf is done with this set of vertices: |