diff options
| author | Keith Whitwell <[email protected]> | 2010-01-05 14:13:40 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-01-05 14:13:40 +0000 |
| commit | c727fa6dbf5a9fca5fc94de06c309f54402449d1 (patch) | |
| tree | d6e721f1dff0ccaf3666756c80a80e7c6d3dec32 /src/gallium/include | |
| parent | c91ceeec320daebe7d9d78ed2d80a2265bcfa8c2 (diff) | |
| parent | e3be32ccf900f22c1f75c9f2d8842fe9630da7d9 (diff) | |
Merge commit 'origin/gallium-draw-retval'
Conflicts:
src/gallium/drivers/identity/id_context.c
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_context.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index 60fa9cef824..d2f8085b421 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -61,27 +61,27 @@ struct pipe_context { * VBO drawing (return false on fallbacks (temporary??)) */ /*@{*/ - boolean (*draw_arrays)( struct pipe_context *pipe, - unsigned mode, unsigned start, unsigned count); + void (*draw_arrays)( struct pipe_context *pipe, + unsigned mode, unsigned start, unsigned count); - boolean (*draw_elements)( struct pipe_context *pipe, - struct pipe_buffer *indexBuffer, - unsigned indexSize, - unsigned mode, unsigned start, unsigned count); + void (*draw_elements)( struct pipe_context *pipe, + struct pipe_buffer *indexBuffer, + unsigned indexSize, + unsigned mode, unsigned start, unsigned count); /* XXX: this is (probably) a temporary entrypoint, as the range * information should be available from the vertex_buffer state. * Using this to quickly evaluate a specialized path in the draw * module. */ - boolean (*draw_range_elements)( struct pipe_context *pipe, - struct pipe_buffer *indexBuffer, - unsigned indexSize, - unsigned minIndex, - unsigned maxIndex, - unsigned mode, - unsigned start, - unsigned count); + void (*draw_range_elements)( struct pipe_context *pipe, + struct pipe_buffer *indexBuffer, + unsigned indexSize, + unsigned minIndex, + unsigned maxIndex, + unsigned mode, + unsigned start, + unsigned count); /*@}*/ /** |