gallium: draw_arrays/elements_instanced() are of type void.

This commit is contained in:
Michal Krol 2010-01-12 18:51:27 +01:00
parent 76ff89d2de
commit 8c53a2576e
3 changed files with 38 additions and 38 deletions

View file

@ -172,7 +172,7 @@ softpipe_draw_elements(struct pipe_context *pipe,
1);
}
boolean
void
softpipe_draw_arrays_instanced(struct pipe_context *pipe,
unsigned mode,
unsigned start,
@ -180,19 +180,19 @@ softpipe_draw_arrays_instanced(struct pipe_context *pipe,
unsigned startInstance,
unsigned instanceCount)
{
return softpipe_draw_range_elements_instanced(pipe,
NULL,
0,
0,
0xffffffff,
mode,
start,
count,
startInstance,
instanceCount);
softpipe_draw_range_elements_instanced(pipe,
NULL,
0,
0,
0xffffffff,
mode,
start,
count,
startInstance,
instanceCount);
}
boolean
void
softpipe_draw_elements_instanced(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
@ -202,16 +202,16 @@ softpipe_draw_elements_instanced(struct pipe_context *pipe,
unsigned startInstance,
unsigned instanceCount)
{
return softpipe_draw_range_elements_instanced(pipe,
indexBuffer,
indexSize,
0,
0xffffffff,
mode,
start,
count,
startInstance,
instanceCount);
softpipe_draw_range_elements_instanced(pipe,
indexBuffer,
indexSize,
0,
0xffffffff,
mode,
start,
count,
startInstance,
instanceCount);
}
static boolean

View file

@ -199,7 +199,7 @@ softpipe_draw_range_elements(struct pipe_context *pipe,
unsigned max_index,
unsigned mode, unsigned start, unsigned count);
boolean
void
softpipe_draw_arrays_instanced(struct pipe_context *pipe,
unsigned mode,
unsigned start,
@ -207,7 +207,7 @@ softpipe_draw_arrays_instanced(struct pipe_context *pipe,
unsigned startInstance,
unsigned instanceCount);
boolean
void
softpipe_draw_elements_instanced(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,

View file

@ -69,21 +69,21 @@ struct pipe_context {
unsigned indexSize,
unsigned mode, unsigned start, unsigned count);
boolean (*draw_arrays_instanced)(struct pipe_context *pipe,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount);
void (*draw_arrays_instanced)(struct pipe_context *pipe,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount);
boolean (*draw_elements_instanced)(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount);
void (*draw_elements_instanced)(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount);
/* XXX: this is (probably) a temporary entrypoint, as the range
* information should be available from the vertex_buffer state.