diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
commit | 155fbcb0ed85c6452cbedd2317f201100fe698ab (patch) | |
tree | 15e8a2662b1341bd07cebb9cd3624bc4ed42d020 /src/gallium/drivers/nv30/nv30_context.h | |
parent | 9a8342ebcd83a2022b3c9b9539c5b15ac56d6440 (diff) | |
parent | eeaa0861bfc98a06ceec269801271b7453c4fcbd (diff) |
Merge commit 'origin/master' into gallium-sw-api-2
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_context.h')
-rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index ea259aadf3..1786460aec 100644 --- 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 * |