diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2008-07-12 00:19:15 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2008-07-12 00:19:15 +0200 |
| commit | 2419a5fe3601851989506a11b0bd4e3cfb071035 (patch) | |
| tree | b68cffce9f12e89949e963fb713b53a59096eadc /src/gallium/drivers/nv30/nv30_context.h | |
| parent | c7086277546d065eb94ba8dbeca1620605f167ea (diff) | |
nv30: Emit vertex program using state objects
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_context.h')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index c3c8b73309..5d7080a555 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -124,6 +124,7 @@ struct nv30_context { unsigned dirty; struct pipe_scissor_state scissor; unsigned stipple[32]; + struct nv30_vertex_program *vertprog; struct pipe_buffer *constbuf[PIPE_SHADER_TYPES]; unsigned constbuf_nr[PIPE_SHADER_TYPES]; struct nv30_rasterizer_state *rasterizer; @@ -151,11 +152,6 @@ struct nv30_context { } vb[16]; struct { - struct nv30_vertex_program *active; - struct nv30_vertex_program *current; - } vertprog; - - struct { struct nv30_fragment_program *active; struct nv30_fragment_program *current; } fragprog; @@ -188,10 +184,6 @@ extern void nv30_screen_init_miptree_functions(struct pipe_screen *pscreen); extern struct draw_stage *nv30_draw_render_stage(struct nv30_context *nv30); /* nv30_vertprog.c */ -extern void nv30_vertprog_translate(struct nv30_context *, - struct nv30_vertex_program *); -extern void nv30_vertprog_bind(struct nv30_context *, - struct nv30_vertex_program *); extern void nv30_vertprog_destroy(struct nv30_context *, struct nv30_vertex_program *); @@ -213,6 +205,7 @@ extern void nv30_state_tex_update(struct nv30_context *nv30); extern struct nv30_state_entry nv30_state_rasterizer; extern struct nv30_state_entry nv30_state_scissor; extern struct nv30_state_entry nv30_state_stipple; +extern struct nv30_state_entry nv30_state_vertprog; extern struct nv30_state_entry nv30_state_blend; extern struct nv30_state_entry nv30_state_blend_colour; extern struct nv30_state_entry nv30_state_zsa; |