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]>

15 files changed, 48 insertions, 48 deletions

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 73478e666dc..d62ab4e674b 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -39,7 +39,7 @@
 extern "C" {
 #endif
 
-struct gl_client_array;
+struct gl_vertex_array;
 struct gl_context;
 struct gl_transform_feedback_object;
 
@@ -139,7 +139,7 @@ struct split_limits {
 
 
 void vbo_split_prims( 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,
@@ -151,11 +151,11 @@ void vbo_split_prims( struct gl_context *ctx,
 
 /* Helpers for dealing translating away non-zero min_index.
  */
-GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] );
-GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] );
+GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] );
+GLboolean vbo_any_varyings_in_vbos( const struct gl_vertex_array *arrays[] );
 
 void vbo_rebase_prims( 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,
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 7a5bd5184f0..7022fe96cab 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -47,7 +47,7 @@ static GLuint check_size( const GLfloat *attr )
  * Helper for initializing a vertex array.
  */
 static void
-init_array(struct gl_context *ctx, struct gl_client_array *cl,
+init_array(struct gl_context *ctx, struct gl_vertex_array *cl,
            unsigned size, const void *pointer)
 {
    memset(cl, 0, sizeof(*cl));
@@ -77,7 +77,7 @@ static void init_legacy_currval(struct gl_context *ctx)
     * attribute:
     */
    for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) {
-      struct gl_client_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)];
+      struct gl_vertex_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)];
 
       init_array(ctx, cl,
                  check_size(ctx->Current.Attrib[i]),
@@ -92,7 +92,7 @@ static void init_generic_currval(struct gl_context *ctx)
    GLuint i;
 
    for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; i++) {
-      struct gl_client_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
+      struct gl_vertex_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
 
       init_array(ctx, cl, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]);
    }
@@ -108,7 +108,7 @@ static void init_mat_currval(struct gl_context *ctx)
     * attribute:
     */
    for (i = 0; i < MAT_ATTRIB_MAX; i++) {
-      struct gl_client_array *cl =
+      struct gl_vertex_array *cl =
          &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT + i];
       unsigned size;
 
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index 11f9b17c7c4..5cf399ffcd7 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -63,7 +63,7 @@ extern "C" {
 #endif
 
 struct vbo_context {
-   struct gl_client_array currval[VBO_ATTRIB_MAX];
+   struct gl_vertex_array currval[VBO_ATTRIB_MAX];
    
    /** Map VERT_ATTRIB_x to VBO_ATTRIB_y */
    GLuint map_vp_none[VERT_ATTRIB_MAX];
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index b1508839450..9358ca2acf1 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -109,13 +109,13 @@ struct vbo_exec_context
       /** pointers into the current 'vertex' array, declared above */
       fi_type *attrptr[VBO_ATTRIB_MAX];
 
-      struct gl_client_array arrays[VERT_ATTRIB_MAX];
+      struct gl_vertex_array arrays[VERT_ATTRIB_MAX];
 
       /* According to program mode, the values above plus current
        * values are squashed down to the 32 attributes passed to the
        * vertex program below:
        */
-      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
+      const struct gl_vertex_array *inputs[VERT_ATTRIB_MAX];
    } vtx;
 
    struct {
@@ -129,7 +129,7 @@ struct vbo_exec_context
        * mode, etc.  These are the attributes as seen by vertex
        * programs:
        */
-      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
+      const struct gl_vertex_array *inputs[VERT_ATTRIB_MAX];
       GLboolean recalculate_inputs;
    } array;
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index cbf78b49631..fffff0b3bf0 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1182,13 +1182,13 @@ vbo_exec_vtx_init(struct vbo_exec_context *exec)
    }
 
    {
-      struct gl_client_array *arrays = exec->vtx.arrays;
+      struct gl_vertex_array *arrays = exec->vtx.arrays;
       unsigned i;
 
       memcpy(arrays, &vbo->currval[VBO_ATTRIB_POS],
              VERT_ATTRIB_FF_MAX * sizeof(arrays[0]));
       for (i = 0; i < VERT_ATTRIB_FF_MAX; ++i) {
-         struct gl_client_array *array;
+         struct gl_vertex_array *array;
          array = &arrays[VERT_ATTRIB_FF(i)];
          array->BufferObj = NULL;
          _mesa_reference_buffer_object(ctx, &array->BufferObj,
@@ -1200,7 +1200,7 @@ vbo_exec_vtx_init(struct vbo_exec_context *exec)
              VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0]));
 
       for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) {
-         struct gl_client_array *array;
+         struct gl_vertex_array *array;
          array = &arrays[VERT_ATTRIB_GENERIC(i)];
          array->BufferObj = NULL;
          _mesa_reference_buffer_object(ctx, &array->BufferObj,
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 08030c454ce..6a96167fbbc 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -243,8 +243,8 @@ recalculate_input_bindings(struct gl_context *ctx)
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
    const struct gl_array_attributes *array = ctx->Array.VAO->VertexAttrib;
-   struct gl_client_array *vertexAttrib = ctx->Array.VAO->_VertexAttrib;
-   const struct gl_client_array **inputs = &exec->array.inputs[0];
+   struct gl_vertex_array *vertexAttrib = ctx->Array.VAO->_VertexAttrib;
+   const struct gl_vertex_array **inputs = &exec->array.inputs[0];
    GLbitfield64 const_inputs = 0x0;
    GLuint i;
 
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 3d1b2f71648..c2fcb663cbe 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -174,7 +174,7 @@ vbo_exec_bind_arrays( struct gl_context *ctx )
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
-   struct gl_client_array *arrays = exec->vtx.arrays;
+   struct gl_vertex_array *arrays = exec->vtx.arrays;
    const GLuint *map;
    GLuint attr;
    GLbitfield64 varying_inputs = 0x0;
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index 24c04ca7e6a..f40c59fdf35 100644
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -79,7 +79,7 @@ REBASE(GLuint)
 REBASE(GLushort)
 REBASE(GLubyte)
 
-GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] )
+GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] )
 {
    GLuint i;
    
@@ -91,7 +91,7 @@ GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] )
    return GL_TRUE;
 }
 
-GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] )
+GLboolean vbo_any_varyings_in_vbos( const struct gl_vertex_array *arrays[] )
 {
    GLuint i;
 
@@ -122,7 +122,7 @@ GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] )
  *      all or nothing.
  */
 void vbo_rebase_prims( 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,
@@ -130,12 +130,12 @@ void vbo_rebase_prims( struct gl_context *ctx,
 		       GLuint max_index,
 		       vbo_draw_func draw )
 {
-   struct gl_client_array tmp_arrays[VERT_ATTRIB_MAX];
-   const struct gl_client_array *tmp_array_pointers[VERT_ATTRIB_MAX];
+   struct gl_vertex_array tmp_arrays[VERT_ATTRIB_MAX];
+   const struct gl_vertex_array *tmp_array_pointers[VERT_ATTRIB_MAX];
 
    struct _mesa_index_buffer tmp_ib;
    struct _mesa_prim *tmp_prims = NULL;
-   const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays;
+   const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays;
    void *tmp_indices = NULL;
    GLuint i;
 
diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index 79603e9b32e..9e83b59623c 100644
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -46,13 +46,13 @@ void vbo_save_init( struct gl_context *ctx )
    vbo_save_api_init( save );
 
    {
-      struct gl_client_array *arrays = save->arrays;
+      struct gl_vertex_array *arrays = save->arrays;
       unsigned i;
 
       memcpy(arrays, &vbo->currval[VBO_ATTRIB_POS],
              VERT_ATTRIB_FF_MAX * sizeof(arrays[0]));
       for (i = 0; i < VERT_ATTRIB_FF_MAX; ++i) {
-         struct gl_client_array *array;
+         struct gl_vertex_array *array;
          array = &arrays[VERT_ATTRIB_FF(i)];
          array->BufferObj = NULL;
          _mesa_reference_buffer_object(ctx, &arrays->BufferObj,
@@ -64,7 +64,7 @@ void vbo_save_init( struct gl_context *ctx )
              VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0]));
 
       for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) {
-         struct gl_client_array *array;
+         struct gl_vertex_array *array;
          array = &arrays[VERT_ATTRIB_GENERIC(i)];
          array->BufferObj = NULL;
          _mesa_reference_buffer_object(ctx, &array->BufferObj,
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index d1d7fb07395..485b7b17c70 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -124,8 +124,8 @@ struct vbo_save_context {
    struct gl_context *ctx;
    GLvertexformat vtxfmt;
    GLvertexformat vtxfmt_noop;  /**< Used if out_of_memory is true */
-   struct gl_client_array arrays[VBO_ATTRIB_MAX];
-   const struct gl_client_array *inputs[VBO_ATTRIB_MAX];
+   struct gl_vertex_array arrays[VBO_ATTRIB_MAX];
+   const struct gl_vertex_array *inputs[VBO_ATTRIB_MAX];
 
    GLbitfield64 enabled; /**< mask of enabled vbo arrays. */
    GLubyte attrsz[VBO_ATTRIB_MAX];  /**< 1, 2, 3 or 4 */
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 2aa00952037..e718f29496a 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -135,7 +135,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx,
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
-   struct gl_client_array *arrays = save->arrays;
+   struct gl_vertex_array *arrays = save->arrays;
    GLuint buffer_offset = node->buffer_offset;
    const GLuint *map;
    GLuint attr;
diff --git a/src/mesa/vbo/vbo_split.c b/src/mesa/vbo/vbo_split.c
index 79d7dd40834..611d4cafbdf 100644
--- a/src/mesa/vbo/vbo_split.c
+++ b/src/mesa/vbo/vbo_split.c
@@ -99,7 +99,7 @@ GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr)
 
 
 void vbo_split_prims( 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,
diff --git a/src/mesa/vbo/vbo_split.h b/src/mesa/vbo/vbo_split.h
index 16276ecc33f..a8c940da934 100644
--- a/src/mesa/vbo/vbo_split.h
+++ b/src/mesa/vbo/vbo_split.h
@@ -50,7 +50,7 @@
 GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr);
 
 void vbo_split_inplace( 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,
@@ -62,7 +62,7 @@ void vbo_split_inplace( struct gl_context *ctx,
 /* Requires ib != NULL:
  */
 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,
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,
diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index cff4bcd30ff..1430ac98960 100644
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -42,7 +42,7 @@
  */
 struct split_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,7 +63,7 @@ struct split_context {
 static void flush_vertex( struct split_context *split )
 {
    struct gl_context *ctx = split->ctx;
-   const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays;
+   const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays;
    struct _mesa_index_buffer ib;
    GLuint i;
 
@@ -262,7 +262,7 @@ static void split_prims( struct split_context *split)
 
 
 void vbo_split_inplace( 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,