#include "glheader.h"
#include "bufferobj.h"
-struct gl_client_array;
+struct gl_vertex_array;
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))
}
/**
- * 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->Normalized = src->Normalized;
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,