From ed43ecee90ad6fdde1e604f7f820ef7f8cd1251b Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 19 Jan 2004 10:41:35 +0000 Subject: Migrate i830 driver to t_vertex.[ch] for building hw vertices. --- src/mesa/drivers/dri/i830/i830_context.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/i830/i830_context.h') diff --git a/src/mesa/drivers/dri/i830/i830_context.h b/src/mesa/drivers/dri/i830/i830_context.h index 188d90c0c9..5f4bb565e1 100644 --- a/src/mesa/drivers/dri/i830/i830_context.h +++ b/src/mesa/drivers/dri/i830/i830_context.h @@ -38,6 +38,7 @@ typedef struct i830_texture_object_t *i830TextureObjectPtr; #include "mtypes.h" #include "drm.h" #include "mm.h" +#include "tnl/t_vertex.h" #include "i830_screen.h" #include "i830_tex.h" @@ -130,17 +131,21 @@ struct i830_context_t GLuint Fallback; GLuint NewGLState; - /* State for i830vb.c and i830tris.c. + /* Vertex state + */ + GLuint vertex_size; + struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX]; + GLuint vertex_attr_count; + char *verts; /* points to tnl->clipspace.vertex_buf */ + + + /* State for i830tris.c. */ - GLuint SetupNewInputs; - GLuint SetupIndex; GLuint RenderIndex; GLmatrix ViewportMatrix; GLenum render_primitive; GLenum reduced_primitive; GLuint hw_primitive; - GLuint vertex_format; - char *verts; drmBufPtr vertex_buffer; char *vertex_addr; @@ -163,8 +168,6 @@ struct i830_context_t GLuint Setup[I830_CTX_SETUP_SIZE]; GLuint BufferSetup[I830_DEST_SETUP_SIZE]; GLuint StippleSetup[I830_STP_SETUP_SIZE]; - int vertex_size; - int vertex_stride_shift; unsigned int lastStamp; GLboolean hw_stipple; -- cgit v1.2.3