diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 93c6f1dfffd..dcb14420330 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -83,10 +83,14 @@ typedef struct nouveau_context {
 	volatile unsigned char* mmio;
 
 	/* State for tris */
-	GLuint vertex_size;
 	GLuint color_offset;
 	GLuint specular_offset;
 
+	/* Vertex state */
+	GLuint vertex_size;
+	struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
+	GLuint vertex_attr_count;
+
 	/* The drawing fallbacks */
 	GLuint Fallback;
 	nouveau_tri_func* draw_tri;