diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/gallium/auxiliary/util/u_draw_quad.h | |
parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/gallium/auxiliary/util/u_draw_quad.h')
-rw-r--r-- | src/gallium/auxiliary/util/u_draw_quad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h index ec4862ead3..00d3f5b715 100644 --- a/src/gallium/auxiliary/util/u_draw_quad.h +++ b/src/gallium/auxiliary/util/u_draw_quad.h @@ -37,7 +37,7 @@ struct pipe_buffer; extern void util_draw_vertex_buffer(struct pipe_context *pipe, - struct pipe_buffer *vbuf, + struct pipe_buffer *vbuf, uint offset, uint num_attribs, uint num_verts, uint prim_type); |