From f6606830271192dc0232b54b776ec263235c0688 Mon Sep 17 00:00:00 2001 From: Mathias Fröhlich Date: Sun, 1 Apr 2018 20:18:36 +0200 Subject: mesa/vbo/tnl: Move gl_vertex_array related stuff to tnl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only remaining users of gl_vertex_array are tnl based drivers. So move everything related to that into tnl and rename it accordingly. Reviewed-by: Brian Paul Signed-off-by: Mathias Fröhlich --- src/mesa/main/mtypes.h | 14 -------------- src/mesa/main/varray.h | 12 ------------ 2 files changed, 26 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0b55a510b08..2ef12a444ea 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1499,20 +1499,6 @@ struct gl_vertex_buffer_binding }; -/** - * Vertex array information which is derived from gl_array_attributes - * and gl_vertex_buffer_binding information. Used by the VBO module and - * device drivers. - */ -struct gl_vertex_array -{ - /** Vertex attribute array */ - const struct gl_array_attributes *VertexAttrib; - /** Vertex buffer binding */ - const struct gl_vertex_buffer_binding *BufferBinding; -}; - - /** * A representation of "Vertex Array Objects" (VAOs) from OpenGL 3.1+ / * the GL_ARB_vertex_array_object extension. diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 6ab55ed36ae..1f01fdd5b10 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -449,18 +449,6 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint divisor); -/** - * Shallow copy one vertex array to another. - */ -static inline void -_mesa_copy_vertex_array(struct gl_vertex_array *dst, - const struct gl_vertex_array *src) -{ - dst->VertexAttrib = src->VertexAttrib; - dst->BufferBinding = src->BufferBinding; -} - - extern void _mesa_copy_vertex_attrib_array(struct gl_context *ctx, struct gl_array_attributes *dst, -- cgit v1.2.3