Merge branch '7.8'

[mesa.git] / src / gallium / drivers / nv30 / nv30_context.h

diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index ea259aadf359f28222d68a5f089098c2afab467e..1786460aec10b9a4ad1274bfb39048c5834e170c 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -107,6 +107,11 @@ struct nv30_state {
        struct nouveau_stateobj *hw[NV30_STATE_MAX];
 };
 
+struct nv30_vtxelt_state {
+       struct pipe_vertex_element pipe[16];
+       unsigned num_elements;
+};
+
 struct nv30_context {
        struct pipe_context pipe;
 
@@ -142,8 +147,7 @@ struct nv30_context {
        unsigned dirty_samplers;
        struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
        unsigned vtxbuf_nr;
-       struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
-       unsigned vtxelt_nr;
+       struct nv30_vtxelt_state *vtxelt;
 };
 
 static INLINE struct nv30_context *