[Mesa-dev] [PATCH v4] mesa: Remove gallium draw_arrays() and draw_arrays_instanced() functions

[Brian Paul]

On 06/06/2013 12:28 PM, Arnas Milasevicius wrote:
>
> Moved draw_arrays() to st_draw_feedback.c and removed draw_arrays_instanced()
> ---
>   v2: removed draw_arrays_instanced() function and modified draw_arrays()
>   v3: improved commit massage

message

>   v4: removed startInstance and instanceCount parameters from draw_arrays()
>   src/mesa/state_tracker/st_draw_feedback.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
> index 6bc0383..1afbbe3 100644
> --- a/src/mesa/state_tracker/st_draw_feedback.c
> +++ b/src/mesa/state_tracker/st_draw_feedback.c
> @@ -89,9 +89,7 @@ static void
>   draw_arrays(struct draw_context *draw,
>   			unsigned mode,
>                          unsigned start,
> -			unsigned count,
> -			unsigned startInstance,
> -			unsigned instanceCount)
> +		        unsigned count)
>   {
>      struct pipe_draw_info info;
>
> @@ -100,8 +98,6 @@ draw_arrays(struct draw_context *draw,
>      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;
>
> @@ -273,7 +269,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
>
>      /* draw here */
>      for (i = 0; i < nr_prims; i++) {
> -      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count, 0, 1);
> +      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);
>      }
>
>
>

It looks like this patch applies after your previous patch.  I think 
they should be combined.

-Brian