X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fvarray.h;h=8c30d16ea3a5df9ffa0f3c8c9abbba1cd52093a7;hb=e70d0d22a2dccc1df2c88890a2964491cdafac94;hp=a766afad5bc3a534b58a4e0e13e0631573dca890;hpb=4a644f1caadc6b3e26b5f0ac60ac855152e38e59;p=mesa.git

diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index a766afad5bc..8c30d16ea3a 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -31,7 +31,7 @@
 #include "glheader.h"
 #include "bufferobj.h"
 
-struct gl_client_array;
+struct gl_vertex_array;
 struct gl_context;
 
 /**
@@ -40,7 +40,7 @@ struct gl_context;
  * a vertex buffer.
  */
 static inline const GLubyte *
-_mesa_vertex_attrib_address(const struct gl_vertex_attrib_array *array,
+_mesa_vertex_attrib_address(const struct gl_array_attributes *array,
                             const struct gl_vertex_buffer_binding *binding)
 {
    if (_mesa_is_bufferobj(binding->BufferObj))
@@ -50,22 +50,20 @@ _mesa_vertex_attrib_address(const struct gl_vertex_attrib_array *array,
 }
 
 /**
- * Sets the fields in a gl_client_array to values derived from a
+ * Sets the fields in a gl_vertex_array to values derived from a
  * gl_vertex_attrib_array and a gl_vertex_buffer_binding.
  */
 static inline void
 _mesa_update_client_array(struct gl_context *ctx,
-                          struct gl_client_array *dst,
-                          const struct gl_vertex_attrib_array *src,
+                          struct gl_vertex_array *dst,
+                          const struct gl_array_attributes *src,
                           const struct gl_vertex_buffer_binding *binding)
 {
    dst->Size = src->Size;
    dst->Type = src->Type;
    dst->Format = src->Format;
-   dst->Stride = src->Stride;
    dst->StrideB = binding->Stride;
    dst->Ptr = _mesa_vertex_attrib_address(src, binding);
-   dst->Enabled = src->Enabled;
    dst->Normalized = src->Normalized;
    dst->Integer = src->Integer;
    dst->Doubles = src->Doubles;
@@ -375,13 +373,13 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint diviso
 
 extern void
 _mesa_copy_client_array(struct gl_context *ctx,
-                        struct gl_client_array *dst,
-                        struct gl_client_array *src);
+                        struct gl_vertex_array *dst,
+                        struct gl_vertex_array *src);
 
 extern void
 _mesa_copy_vertex_attrib_array(struct gl_context *ctx,
-                               struct gl_vertex_attrib_array *dst,
-                               const struct gl_vertex_attrib_array *src);
+                               struct gl_array_attributes *dst,
+                               const struct gl_array_attributes *src);
 
 extern void
 _mesa_copy_vertex_buffer_binding(struct gl_context *ctx,