From 3069357ef0cfa112c3c77a25c010df7f9af4467d Mon Sep 17 00:00:00 2001 From: Arnas Milasevicius Date: Fri, 7 Jun 2013 01:21:19 +0300 Subject: gallium: Remove draw_arrays() and draw_arrays_instanced() functions Moved draw_arrays() to st_draw_feedback.c and removed draw_arrays_instanced(). draw_arrays() was used by nobody else. Now there's just one "draw" entrypoint into the draw module. Signed-off-by: Brian Paul --- src/gallium/auxiliary/draw/draw_context.h | 11 --------- src/gallium/auxiliary/draw/draw_pt.c | 40 ------------------------------- 2 files changed, 51 deletions(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h index 2d843b7a047..4a1b27ee414 100644 --- a/src/gallium/auxiliary/draw/draw_context.h +++ b/src/gallium/auxiliary/draw/draw_context.h @@ -241,17 +241,6 @@ draw_set_mapped_so_targets(struct draw_context *draw, void draw_vbo(struct draw_context *draw, const struct pipe_draw_info *info); -void draw_arrays(struct draw_context *draw, unsigned prim, - unsigned start, unsigned count); - -void -draw_arrays_instanced(struct draw_context *draw, - unsigned mode, - unsigned start, - unsigned count, - unsigned startInstance, - unsigned instanceCount); - /******************************************************************************* * Driver backend interface diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c index ce36ed09623..131bd132c4f 100644 --- a/src/gallium/auxiliary/draw/draw_pt.c +++ b/src/gallium/auxiliary/draw/draw_pt.c @@ -413,46 +413,6 @@ draw_pt_arrays_restart(struct draw_context *draw, } - -/** - * Non-instanced drawing. - * \sa draw_arrays_instanced - */ -void -draw_arrays(struct draw_context *draw, unsigned prim, - unsigned start, unsigned count) -{ - draw_arrays_instanced(draw, prim, start, count, 0, 1); -} - - -/** - * Instanced drawing. - * \sa draw_vbo - */ -void -draw_arrays_instanced(struct draw_context *draw, - unsigned mode, - unsigned start, - unsigned count, - unsigned startInstance, - unsigned instanceCount) -{ - struct pipe_draw_info info; - - util_draw_init_info(&info); - - info.mode = mode; - info.start = start; - info.count = count; - info.start_instance = startInstance; - info.instance_count = instanceCount; - info.min_index = start; - info.max_index = start + count - 1; - - draw_vbo(draw, &info); -} - /** * Resolve true values within pipe_draw_info. * If we're rendering from transform feedback/stream output -- cgit v1.2.3