gallium: Keep only pipe_context::draw_vbo.

That is, remove pipe_context::draw_arrays, pipe_context::draw_elements,
pipe_context::draw_arrays_instanced,
pipe_context::draw_elements_instanced,
pipe_context::draw_range_elements.

3 files changed, 2 insertions, 41 deletions

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 3fc39c11372..0874cb5e4ea 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -82,10 +82,6 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
 
 	nv50->pipe.destroy = nv50_destroy;
 
-	nv50->pipe.draw_arrays = nv50_draw_arrays;
-	nv50->pipe.draw_arrays_instanced = nv50_draw_arrays_instanced;
-	nv50->pipe.draw_elements = nv50_draw_elements;
-	nv50->pipe.draw_elements_instanced = nv50_draw_elements_instanced;
 	nv50->pipe.draw_vbo = nv50_draw_vbo;
 	nv50->pipe.clear = nv50_clear;
 
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index a7c2b5d4874..d24d6c50ea8 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -180,24 +180,6 @@ nv50_surface_do_copy(struct nv50_screen *screen, struct pipe_surface *dst,
 extern struct draw_stage *nv50_draw_render_stage(struct nv50_context *nv50);
 
 /* nv50_vbo.c */
-extern void nv50_draw_arrays(struct pipe_context *, unsigned mode,
-				unsigned start, unsigned count);
-extern void nv50_draw_arrays_instanced(struct pipe_context *, unsigned mode,
-					unsigned start, unsigned count,
-					unsigned startInstance,
-					unsigned instanceCount);
-extern void nv50_draw_elements(struct pipe_context *pipe,
-				  struct pipe_resource *indexBuffer,
-				  unsigned indexSize, int indexBias,
-				  unsigned mode, unsigned start,
-				  unsigned count);
-extern void nv50_draw_elements_instanced(struct pipe_context *pipe,
-					 struct pipe_resource *indexBuffer,
-					 unsigned indexSize, int indexBias,
-					 unsigned mode, unsigned start,
-					 unsigned count,
-					 unsigned startInstance,
-					 unsigned instanceCount);
 extern void nv50_draw_vbo(struct pipe_context *pipe,
                           const struct pipe_draw_info *info);
 extern void nv50_vtxelt_construct(struct nv50_vtxelt_stateobj *cso);
diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 11ffc182c2d..e7f8fe33edf 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -173,7 +173,7 @@ instance_step(struct nv50_context *nv50, struct instance *a)
 	}
 }
 
-void
+static void
 nv50_draw_arrays_instanced(struct pipe_context *pipe,
 			   unsigned mode, unsigned start, unsigned count,
 			   unsigned startInstance, unsigned instanceCount)
@@ -220,13 +220,6 @@ nv50_draw_arrays_instanced(struct pipe_context *pipe,
 	}
 }
 
-void
-nv50_draw_arrays(struct pipe_context *pipe, unsigned mode, unsigned start,
-		 unsigned count)
-{
-	nv50_draw_arrays_instanced(pipe, mode, start, count, 0, 1);
-}
-
 struct inline_ctx {
 	struct nv50_context *nv50;
 	void *map;
@@ -384,7 +377,7 @@ nv50_draw_elements_inline(struct pipe_context *pipe,
 	pipe_buffer_unmap(pipe, indexBuffer, transfer);
 }
 
-void
+static void
 nv50_draw_elements_instanced(struct pipe_context *pipe,
 			     struct pipe_resource *indexBuffer,
 			     unsigned indexSize, int indexBias,
@@ -464,16 +457,6 @@ nv50_draw_elements_instanced(struct pipe_context *pipe,
 }
 
 void
-nv50_draw_elements(struct pipe_context *pipe,
-		   struct pipe_resource *indexBuffer,
-		   unsigned indexSize, int indexBias,
-		   unsigned mode, unsigned start, unsigned count)
-{
-	nv50_draw_elements_instanced(pipe, indexBuffer, indexSize, indexBias,
-				     mode, start, count, 0, 1);
-}
-
-void
 nv50_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
 {
 	struct nv50_context *nv50 = nv50_context(pipe);