mesa: rename gl_client_array -> gl_vertex_array

The term "client array" is a legacy thing dating back to the pre-VBO
era when _all_ vertex arrays lived in client memory.

Nowadays, it only contains vertex array state which is derived from
gl_array_attributes and gl_vertex_buffer_binding.  It's used by the
VBO module and some drivers.

Reviewed-by: Anuj Phogat <[email protected]>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index ac4fe9e8127..ce8831dbb0c 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -52,7 +52,7 @@
 struct copy_context {
 
    struct gl_context *ctx;
-   const struct gl_client_array **array;
+   const struct gl_vertex_array **array;
    const struct _mesa_prim *prim;
    GLuint nr_prims;
    const struct _mesa_index_buffer *ib;
@@ -63,15 +63,15 @@ struct copy_context {
    struct {
       GLuint attr;
       GLuint size;
-      const struct gl_client_array *array;
+      const struct gl_vertex_array *array;
       const GLubyte *src_ptr;
 
-      struct gl_client_array dstarray;
+      struct gl_vertex_array dstarray;
 
    } varying[VERT_ATTRIB_MAX];
    GLuint nr_varying;
 
-   const struct gl_client_array *dstarray_ptr[VERT_ATTRIB_MAX];
+   const struct gl_vertex_array *dstarray_ptr[VERT_ATTRIB_MAX];
    struct _mesa_index_buffer dstib;
 
    GLuint *translated_elt_buf;
@@ -104,7 +104,7 @@ struct copy_context {
 };
 
 
-static GLuint attr_size( const struct gl_client_array *array )
+static GLuint attr_size( const struct gl_vertex_array *array )
 {
    return array->Size * _mesa_sizeof_type(array->Type);
 }
@@ -140,7 +140,7 @@ check_flush( struct copy_context *copy )
  */
 static void
 dump_draw_info(struct gl_context *ctx,
-               const struct gl_client_array **arrays,
+               const struct gl_vertex_array **arrays,
                const struct _mesa_prim *prims,
                GLuint nr_prims,
                const struct _mesa_index_buffer *ib,
@@ -174,7 +174,7 @@ static void
 flush( struct copy_context *copy )
 {
    struct gl_context *ctx = copy->ctx;
-   const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays;
+   const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays;
    GLuint i;
 
    /* Set some counters: 
@@ -258,7 +258,7 @@ elt(struct copy_context *copy, GLuint elt_idx)
 /*       printf("  --> emit to dstelt %d\n", copy->dstbuf_nr); */
 
       for (i = 0; i < copy->nr_varying; i++) {
-	 const struct gl_client_array *srcarray = copy->varying[i].array;
+	 const struct gl_vertex_array *srcarray = copy->varying[i].array;
 	 const GLubyte *srcptr = copy->varying[i].src_ptr + elt * srcarray->StrideB;
 
 	 memcpy(csr, srcptr, copy->varying[i].size);
@@ -521,8 +521,8 @@ replay_init( struct copy_context *copy )
    /* Setup new vertex arrays to point into the output buffer: 
     */
    for (offset = 0, i = 0; i < copy->nr_varying; i++) {
-      const struct gl_client_array *src = copy->varying[i].array;
-      struct gl_client_array *dst = &copy->varying[i].dstarray;
+      const struct gl_vertex_array *src = copy->varying[i].array;
+      struct gl_vertex_array *dst = &copy->varying[i].dstarray;
 
       dst->Size = src->Size;
       dst->Type = src->Type;
@@ -593,7 +593,7 @@ replay_finish( struct copy_context *copy )
  * Split VBO into smaller pieces, draw the pieces.
  */
 void vbo_split_copy( struct gl_context *ctx,
-		     const struct gl_client_array *arrays[],
+		     const struct gl_vertex_array *arrays[],
 		     const struct _mesa_prim *prim,
 		     GLuint nr_prims,
 		     const struct _mesa_index_buffer *ib,