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/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index e5b949fbaec..5ab10de83a2 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -310,9 +310,9 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
    return PIPE_FORMAT_NONE; /* silence compiler warning */
 }
 
-static const struct gl_client_array *
+static const struct gl_vertex_array *
 get_client_array(const struct st_vertex_program *vp,
-                 const struct gl_client_array **arrays,
+                 const struct gl_vertex_array **arrays,
                  int attr)
 {
    const GLuint mesaAttr = vp->index_to_input[attr];
@@ -329,7 +329,7 @@ get_client_array(const struct st_vertex_program *vp,
 static GLboolean
 is_interleaved_arrays(const struct st_vertex_program *vp,
                       const struct st_vp_variant *vpv,
-                      const struct gl_client_array **arrays)
+                      const struct gl_vertex_array **arrays)
 {
    GLuint attr;
    const struct gl_buffer_object *firstBufObj = NULL;
@@ -338,7 +338,7 @@ is_interleaved_arrays(const struct st_vertex_program *vp,
    GLboolean userSpaceBuffer = GL_FALSE;
 
    for (attr = 0; attr < vpv->num_inputs; attr++) {
-      const struct gl_client_array *array;
+      const struct gl_vertex_array *array;
       const struct gl_buffer_object *bufObj;
       GLsizei stride;
 
@@ -444,7 +444,7 @@ static boolean
 setup_interleaved_attribs(struct st_context *st,
                           const struct st_vertex_program *vp,
                           const struct st_vp_variant *vpv,
-                          const struct gl_client_array **arrays,
+                          const struct gl_vertex_array **arrays,
                           struct pipe_vertex_buffer *vbuffer,
                           struct pipe_vertex_element velements[])
 {
@@ -458,7 +458,7 @@ setup_interleaved_attribs(struct st_context *st,
     * Init bufobj and stride.
     */
    if (vpv->num_inputs) {
-      const struct gl_client_array *array;
+      const struct gl_vertex_array *array;
 
       array = get_client_array(vp, arrays, 0);
       assert(array);
@@ -492,7 +492,7 @@ setup_interleaved_attribs(struct st_context *st,
    usingVBO = _mesa_is_bufferobj(bufobj);
 
    for (attr = 0; attr < vpv->num_inputs;) {
-      const struct gl_client_array *array;
+      const struct gl_vertex_array *array;
       unsigned src_offset;
       unsigned src_format;
 
@@ -557,7 +557,7 @@ static boolean
 setup_non_interleaved_attribs(struct st_context *st,
                               const struct st_vertex_program *vp,
                               const struct st_vp_variant *vpv,
-                              const struct gl_client_array **arrays,
+                              const struct gl_vertex_array **arrays,
                               struct pipe_vertex_buffer vbuffer[],
                               struct pipe_vertex_element velements[],
                               unsigned *num_vbuffers)
@@ -569,7 +569,7 @@ setup_non_interleaved_attribs(struct st_context *st,
 
    for (attr = 0; attr < vpv->num_inputs;) {
       const GLuint mesaAttr = vp->index_to_input[attr];
-      const struct gl_client_array *array;
+      const struct gl_vertex_array *array;
       struct gl_buffer_object *bufobj;
       GLsizei stride;
       unsigned src_format;
@@ -587,7 +587,7 @@ setup_non_interleaved_attribs(struct st_context *st,
 
       if (_mesa_is_bufferobj(bufobj)) {
          /* Attribute data is in a VBO.
-          * Recall that for VBOs, the gl_client_array->Ptr field is
+          * Recall that for VBOs, the gl_vertex_array->Ptr field is
           * really an offset from the start of the VBO, not a pointer.
           */
          struct st_buffer_object *stobj = st_buffer_object(bufobj);
@@ -640,7 +640,7 @@ setup_non_interleaved_attribs(struct st_context *st,
 static void update_array(struct st_context *st)
 {
    struct gl_context *ctx = st->ctx;
-   const struct gl_client_array **arrays = ctx->Array._DrawArrays;
+   const struct gl_vertex_array **arrays = ctx->Array._DrawArrays;
    const struct st_vertex_program *vp;
    const struct st_vp_variant *vpv;
    struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS];