vbo: Readd the arrays argument to the legacy draw methods.

The legacy draw paths from back before 2012 contained a gl_vertex_array
array for the inputs to be used for draw. So all draw methods from legacy
drivers and everything that goes through tnl are originally written
for this calling convention. The same goes for tools like t_rebase or
vbo_split*, that even partly still have the original calling convention
with a currently unused such pointer.
Back in 2012 patch 50f7e75

mesa: move gl_client_array*[] from vbo_draw_func into gl_context

introduced Array._DrawArrays, which was something that was IMO aiming for
a similar direction than Array._DrawVAO introduced recently.
Now several tools like t_rebase and vbo_split*, which are mostly used by
tnl based drivers, would need to be converted to use the internal
Array._DrawVAO instead of Array._DrawArrays. The same goes for the driver
backends that use any of these tools.
Alternatively we can reintroduce the gl_vertex_array array in its call
argument list and put these tools finally into the tnl directory.
So this change reintroduces this gl_vertex_array array for the legacy
draw paths that are still required for the tools t_rebase and vbo_split*.
A followup will move vbo_split also into tnl.

Note that none of the affected drivers use the DriverFlags.NewArray
driver bit. So it should be safe to remove this also for the legacy
draw path.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>

3 files changed, 7 insertions, 11 deletions

diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 96d6b988d3e..a0fd58432a1 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -426,6 +426,7 @@ static void unmap_vbos( struct gl_context *ctx,
 /* This is the main workhorse doing all the rendering work.
  */
 void _tnl_draw_prims(struct gl_context *ctx,
+                     const struct gl_vertex_array *arrays,
 			 const struct _mesa_prim *prim,
 			 GLuint nr_prims,
 			 const struct _mesa_index_buffer *ib,
@@ -437,7 +438,6 @@ void _tnl_draw_prims(struct gl_context *ctx,
 			 struct gl_buffer_object *indirect)
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   const struct gl_vertex_array *arrays = ctx->Array._DrawArrays;
    const GLuint TEST_SPLIT = 0;
    const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;
    GLint max_basevertex = prim->basevertex;
@@ -563,8 +563,9 @@ _tnl_draw(struct gl_context *ctx,
     */
    _tnl_bind_inputs(ctx);
 
-   _tnl_draw_prims(ctx, prim, nr_prims, ib, index_bounds_valid,
-                   min_index, max_index, tfb_vertcount, stream, indirect);
+   _tnl_draw_prims(ctx, ctx->Array._DrawArrays, prim, nr_prims, ib,
+                   index_bounds_valid, min_index, max_index,
+                   tfb_vertcount, stream, indirect);
 }
 
 
diff --git a/src/mesa/tnl/t_rebase.c b/src/mesa/tnl/t_rebase.c
index 0fcee03b24b..19e759f44be 100644
--- a/src/mesa/tnl/t_rebase.c
+++ b/src/mesa/tnl/t_rebase.c
@@ -115,7 +115,6 @@ void t_rebase_prims( struct gl_context *ctx,
 
    struct _mesa_index_buffer tmp_ib;
    struct _mesa_prim *tmp_prims = NULL;
-   const struct gl_vertex_array *saved_arrays = ctx->Array._DrawArrays;
    void *tmp_indices = NULL;
    GLuint i;
 
@@ -233,10 +232,8 @@ void t_rebase_prims( struct gl_context *ctx,
    
    /* Re-issue the draw call.
     */
-   ctx->Array._DrawArrays = tmp_arrays;
-   ctx->NewDriverState |= ctx->DriverFlags.NewArray;
-
-   draw( ctx, 
+   draw( ctx,
+         tmp_arrays,
 	 prim,
 	 nr_prims, 
 	 ib, 
@@ -245,9 +242,6 @@ void t_rebase_prims( struct gl_context *ctx,
 	 max_index - min_index,
 	 NULL, 0, NULL );
 
-   ctx->Array._DrawArrays = saved_arrays;
-   ctx->NewDriverState |= ctx->DriverFlags.NewArray;
-   
    free(tmp_indices);
    
    free(tmp_prims);
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index 14e590501ef..e79c4f62048 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -83,6 +83,7 @@ struct _mesa_index_buffer;
 
 void
 _tnl_draw_prims(struct gl_context *ctx,
+                const struct gl_vertex_array *arrays,
 		     const struct _mesa_prim *prim,
 		     GLuint nr_prims,
 		     const struct _mesa_index_buffer *ib,