diff options
| author | Patrice Mandin <[email protected]> | 2008-07-12 13:16:47 +0200 |
|---|---|---|
| committer | Patrice Mandin <[email protected]> | 2008-07-12 13:16:47 +0200 |
| commit | 12118fcd123992f48ce78629e79e9949b96cd525 (patch) | |
| tree | c4264b2be234bbfc83388c94091df19a6b95dac6 /src/gallium/drivers/nv30/nv30_context.h | |
| parent | ac44f334e3492ab68eb310cfe43ed22206a042d8 (diff) | |
nv30: Emit vertex buffer objects using state objects
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_context.h')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index 2e7b62a69a3..823b34a7c3b 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -128,20 +128,17 @@ struct nv30_context { struct pipe_blend_color blend_colour; struct pipe_viewport_state viewport; struct pipe_framebuffer_state framebuffer; + struct pipe_buffer *idxbuf; + unsigned idxbuf_format; struct nv30_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS]; struct nv30_miptree *tex_miptree[PIPE_MAX_SAMPLERS]; unsigned nr_samplers; unsigned nr_textures; unsigned dirty_samplers; - - unsigned vb_enable; - struct { - struct pipe_buffer *buffer; - unsigned delta; - } vb[16]; - - struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS]; + struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS]; + unsigned vtxbuf_nr; struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS]; + unsigned vtxelt_nr; const unsigned *edgeflags; }; @@ -193,6 +190,7 @@ extern struct nv30_state_entry nv30_state_zsa; extern struct nv30_state_entry nv30_state_viewport; extern struct nv30_state_entry nv30_state_framebuffer; extern struct nv30_state_entry nv30_state_fragtex; +extern struct nv30_state_entry nv30_state_vbo; /* nv30_vbo.c */ extern boolean nv30_draw_arrays(struct pipe_context *, unsigned mode, |